Arnd Bergmann 40ba95fdf1 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>		2012-01-07 11:51:28 +00:00
..
include/mach	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
dma.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
irq.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
riscpc.c	ARM: restart: riscpc: use new restart hook	2012-01-05 12:57:18 +00:00