| commit | 928a11ba36f999436915ea2b1eadf54301f93059 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 20:21:04 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 20:23:00 2012 +0000 |
| tree | 8d7cb575d528ddd4b1165e4690401c729c1eb930 | |
| parent | 237c78beb8a988453bac1993d21f025d070a0d8d [diff] | |
| parent | 40ba95fdf158713377d47736b1b3a9d75f4f2515 [diff] |
Merge branch 'next/cleanup' into samsung/dt Conflicts: arch/arm/mach-exynos/common.c The common.c file gets changes from rmk/stable-devel (part of next/cleanup), rmk/restart, samsung/dt and follow-on branches from the samsung tree. Pulling it all together here hopefully avoids having to do even more conflicting merge changesets in this one file. What a mess! Signed-off-by: Arnd Bergmann <arnd@arndb.de>