| commit | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 16:14:07 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 16:14:07 2012 +0000 |
| tree | 8cced517382b7087df4e89a9e2a00ccac9676a92 | |
| parent | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 [diff] | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d [diff] |
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>