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
..
clkdev.h	[ARM] 5474/1: U300 clocking framework	2009-04-28 22:44:12 +01:00
coh901318.h	mach-u300: define a dummy filter function for coh901318	2011-03-14 14:05:17 +01:00
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
dma_channels.h	ARM: 5852/1: Add COH 901 318 DMA driver platform config for U300	2010-01-27 22:00:15 +00:00
entry-macro.S	ARM: u300: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +00:00
gpio-u300.h	ARM: 7083/1: rewrite U300 GPIO to use gpiolib	2011-09-08 10:03:56 +01:00
gpio.h	ARM: mark empty gpio.h files empty	2011-10-29 13:05:46 +02:00
hardware.h	[ARM] 5470/1: U300 register definitions	2009-04-28 22:44:05 +01:00
io.h	[ARM] 5470/1: U300 register definitions	2009-04-28 22:44:05 +01:00
irqs.h	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
platform.h	ARM: restart: u300: use new restart hook	2012-01-05 12:57:20 +00:00
syscon.h	pinctrl: add a driver for the U300 pinmux	2011-10-13 12:57:45 +02:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
timex.h	[ARM] 5473/1: U300 core machine support	2009-04-28 22:44:15 +01:00
u300-regs.h	ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors	2011-06-09 10:15:06 +01:00
uncompress.h	[ARM] 5473/1: U300 core machine support	2009-04-28 22:44:15 +01:00