diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 22:27:21 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 22:27:21 +0200 |
commit | efe20b421f48c59ff0cda24ab5ef920093afe645 (patch) | |
tree | 48768f064a5b9c7e4d9a3234202b3eca9e68e443 /arch/arm/mach-s3c24xx/Kconfig | |
parent | Merge tag 'omap-for-v3.11/mailbox-signed' of git://git.kernel.org/pub/scm/lin... (diff) | |
parent | ARM: dts: Set BUCK7 as always on for Origen board (diff) | |
parent | ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata (diff) | |
download | linux-efe20b421f48c59ff0cda24ab5ef920093afe645.tar.xz linux-efe20b421f48c59ff0cda24ab5ef920093afe645.zip |
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>