| commit | a07613a54d700a974f3a4a657da78ef5d097315d | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 16:01:00 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 16:01:00 2012 +0000 |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa | |
| parent | 65db039bf7402f0a5b19cbf6dcff55ebea433b8b [diff] | |
| parent | 928a11ba36f999436915ea2b1eadf54301f93059 [diff] |
Merge branch 'samsung/dt' into samsung/cleanup Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de>