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
addr-map.c
buffalo-wxl-setup.c	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00
common.c	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00
common.h	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00
db78x00-bp-setup.c	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00
irq.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
Kconfig	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mpp.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	2011-08-08 14:27:41 +01:00
mpp.h	ARM: orion: Refactor the MPP code common in the orion platform	2011-05-16 15:25:54 -04:00
pcie.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-07-29 23:35:05 -07:00
rd78x00-masa-setup.c	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00