summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-26 11:58:35 +0200
committerArnd Bergmann <arnd@arndb.de>2014-07-26 11:59:20 +0200
commitf169f4007e46c41adadcb34ce248a39f543aaac0 (patch)
tree0ad90064a1166b2f2a609f66ec9241f021d2e795 /arch/arm/Makefile
parentMerge tag 'omap-for-v3.17/soc-new' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentLinux 3.16-rc6 (diff)
parentARM: EXYNOS: Add support for mapping PMU base address via DT (diff)
parentvideo: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes (diff)
downloadlinux-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>