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 | |
| parent | f9f697a77d23dfbd00bd75b27b67fea1fd7a1767 (diff) | |
| parent | 5f13269130d6798571ffbd9d84dbef0950984c5b (diff) | |
| parent | 52c76e44f1b8e63474b9ef5455f657c13e983e95 (diff) | |
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>