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/Makefile | |
parent | Merge tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | Linux 3.16-rc6 (diff) | |
parent | ARM: EXYNOS: Add support for mapping PMU base address via DT (diff) | |
parent | video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes (diff) | |
download | linux-f169f4007e46c41adadcb34ce248a39f543aaac0.tar.xz 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>