Merge branches 'samsung/exynos-dt2' and 'samsung/s3c24xx-dt2' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:27:21 +0000 (22:27 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:27:21 +0000 (22:27 +0200)
This is the merge base for samsung/common-clk-audio

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2  3 
Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
arch/arm/boot/dts/Makefile
arch/arm/mach-s3c24xx/Kconfig
arch/arm/mach-s3c24xx/Makefile

Simple merge
Simple merge
Simple merge