diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:16:29 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:16:29 +0100 |
commit | dcf7ec5ee62a78123057a1e286c88ca739717409 (patch) | |
tree | fa3f19434638a942ba66d236dde4d9aaadf8b370 /arch/arm/plat-omap/debug-devices.c | |
parent | Merge branch 'drivers/rtc-sa1100' into next/drivers (diff) | |
parent | Merge branch 'samsung/cleanup' into samsung/driver (diff) | |
download | linux-dcf7ec5ee62a78123057a1e286c88ca739717409.tar.xz linux-dcf7ec5ee62a78123057a1e286c88ca739717409.zip |
Merge branch 'samsung/driver' into next/drivers
Conflicts:
arch/arm/mach-mxs/include/mach/common.h
Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-omap/debug-devices.c')
0 files changed, 0 insertions, 0 deletions