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)
commitefe20b421f48c59ff0cda24ab5ef920093afe645
tree48768f064a5b9c7e4d9a3234202b3eca9e68e443
parentf9f697a77d23dfbd00bd75b27b67fea1fd7a1767
parent5f13269130d6798571ffbd9d84dbef0950984c5b
parent52c76e44f1b8e63474b9ef5455f657c13e983e95
Merge branches 'samsung/exynos-dt2' and 'samsung/s3c24xx-dt2' into next/drivers

This is the merge base for samsung/common-clk-audio

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