Arnd Bergmann 54cab10f63 Merge branch 'mvebu/soc3' into next/dt ... The dts Makefile has a bunch of nasty conflicts, attempt to resolve these now to avoid trouble later. Conflicts: arch/arm/boot/dts/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2014-03-17 12:13:09 +01:00
..
include/mach	Merge branch 'mvebu/soc3' into next/dt	2014-03-17 12:13:09 +01:00
board-dt.c	ARM: kirkwood: Remove redundant kexec code	2014-02-24 18:48:56 +00:00
common.c	ARM: orion: Move cache-feroceon-l2.h out of plat-orion	2014-02-22 20:43:15 +00:00
common.h	ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT	2014-02-22 20:39:06 +00:00
d2net_v2-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
irq.c	ARM: Kirkwood: Fix sparse warnings.	2012-11-19 03:53:46 +00:00
Kconfig	ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT	2014-02-22 20:39:06 +00:00
lacie_v2-common.c	misc: (at24) move header to linux/platform_data/	2013-09-30 06:02:34 +02:00
lacie_v2-common.h	[ARM] Kirkwood: fix timer initialization for LaCie boards	2010-10-21 14:13:58 -04:00
Makefile	ARM: kirkwood: Separate board-dt from common and pcie code.	2014-02-22 20:40:42 +00:00
Makefile.boot	ARM: kirkwood: move new dtbs to common Makefile	2012-09-22 14:24:00 -07:00
mpp.c	ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().	2013-06-06 18:16:04 +00:00
mpp.h	ARM: orion: Fix Orion5x GPIO regression from MPP cleanup	2012-02-09 16:16:31 -08:00
netxbig_v2-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
openrd-setup.c	arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument	2013-08-12 19:10:23 +00:00
pcie.c	ARM: kirkwood: Move to ID based MBus window creation	2013-08-06 14:10:05 +00:00
pm.c	ARM: kirkwood: ioremap memory control register	2014-02-22 20:41:53 +00:00
pm.h	ARM: kirkwood: Give pm.c its own header file.	2014-02-22 20:38:22 +00:00
rd88f6192-nas-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
rd88f6281-setup.c	arch/arm/mach-kirkwood: Avoid using ARRAY_AND_SIZE(e) as a function argument	2013-08-12 19:10:23 +00:00
t5325-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
ts41x-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
ts219-setup.c	Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x	2013-05-13 15:57:29 +00:00
tsx1x-common.c	ARM: Kirkwood: Fix sparse warnings.	2012-11-19 03:53:46 +00:00
tsx1x-common.h	ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text	2010-07-26 10:33:08 +01:00