| commit | b001befe58691ef3627458cd814e8cee7f845c5f | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 12:44:37 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 20:40:51 2012 +0000 |
| tree | 1083f1a1cd3feeceeac4b395534df0ff032fdbc8 | |
| parent | 31b2a868451d630bacfdeddc626371b3f9d9a01c [diff] | |
| parent | 928a11ba36f999436915ea2b1eadf54301f93059 [diff] |
Merge branch 'samsung/dt' into next/dt * samsung/dt: (3 commit) Merge branch 'depends/rmk/for-linus' into samsung/dt Merge branch 'depends/rmk/restart' into next/cleanup Merge branch 'next/cleanup' into samsung/dt Conflicts: arch/arm/mach-tegra/board-dt.c arch/arm/mach-tegra/include/mach/entry-macro.S The latest version of the samsung/dt branch resolves all sorts of conflicts with the latest upstream, no functional changes that are not already there. Signed-off-by: Arnd Bergmann <arnd@arndb.de>