| commit | 40ba95fdf158713377d47736b1b3a9d75f4f2515 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 11:51:28 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Jan 07 11:51:28 2012 +0000 |
| tree | 17a3216542d1107f777fd82577c91aebbce597d6 | |
| parent | 70d84a6431d732cbc4e68e72b6890cdd3865d43d [diff] | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 [diff] |
Merge branch 'depends/rmk/restart' into next/cleanup Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de>