diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:14:07 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:14:07 +0100 |
commit | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (patch) | |
tree | 8cced517382b7087df4e89a9e2a00ccac9676a92 /arch/arm/include/asm/smp_plat.h | |
parent | Merge branch 'next-samsung-devel-mmc-spi5' of git://git.kernel.org/pub/scm/li... (diff) | |
parent | Merge branch 'samsung/dt' into samsung/cleanup (diff) | |
download | linux-142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6.tar.xz linux-142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6.zip |
Merge branch 'samsung/cleanup' into samsung/driver
Conflicts:
arch/arm/mach-s5p64x0/cpu.c -> common.c
More changes to a file that got moved into common.c,
see previous conflict resolutions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/smp_plat.h')
0 files changed, 0 insertions, 0 deletions