projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9f697a 5f13269 52c76e4)
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 patch | diff1 | diff2 | diff3 | blob | history
arch/arm/boot/dts/Makefile patch | diff1 | diff2 | diff3 | blob | history
arch/arm/mach-s3c24xx/Kconfig patch | diff1 | diff2 | diff3 | blob | history
arch/arm/mach-s3c24xx/Makefile patch | diff1 | diff2 | diff3 | blob | history

diff --cc arch/arm/boot/dts/Makefile
Simple merge
diff --cc arch/arm/mach-s3c24xx/Kconfig
Simple merge
diff --cc arch/arm/mach-s3c24xx/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.