diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 12:51:28 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 12:51:28 +0100 |
| commit | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (patch) | |
| tree | 17a3216542d1107f777fd82577c91aebbce597d6 /arch/avr32 | |
| parent | Merge branch 'tegra/cleanup' into next/cleanup (diff) | |
| parent | ARM: 7198/1: arm/imx6: add restart support for imx6q (diff) | |
| download | linux-40ba95fdf158713377d47736b1b3a9d75f4f2515.tar.xz linux-40ba95fdf158713377d47736b1b3a9d75f4f2515.zip | |
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>
Diffstat (limited to 'arch/avr32')
0 files changed, 0 insertions, 0 deletions