diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-07-26 11:58:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-07-26 11:59:20 +0200 |
| commit | f169f4007e46c41adadcb34ce248a39f543aaac0 (patch) | |
| tree | 0ad90064a1166b2f2a609f66ec9241f021d2e795 /arch/arm/mach-s5pc100/setup-keypad.c | |
| parent | 0081b77d98317092d2292ff0f8e33c97c1f5d918 (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| parent | fce9e5bb25264153f9f002eada41757118d25ba9 (diff) | |
| parent | f86e0add813a3cc0e338089fa6c0928f5f6dc52d (diff) | |
| download | blackbird-op-linux-f169f4007e46c41adadcb34ce248a39f543aaac0.tar.gz blackbird-op-linux-f169f4007e46c41adadcb34ce248a39f543aaac0.zip | |
Merge branches 'samsung/cleanup' and 'samsung/s5p-cleanup-v2', tag 'v3.16-rc6' into next/soc
The following samsung branches are based on these cleanups,
which are already in mainline before this branch gets pulled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
