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	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
buffalo-wxl-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
common.c	ARM: orion: Move cache-feroceon-l2.h out of plat-orion	2014-02-22 20:43:15 +00:00
common.h	reboot: arm: change reboot_mode to use enum reboot_mode	2013-07-09 10:33:29 -07:00
db78x00-bp-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
irq.c	Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood	2012-09-22 14:22:47 -07:00
Kconfig	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile	arm: mach-mv78xx0: convert to use the mvebu-mbus driver	2013-04-15 14:06:39 +00:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mpp.c	arm: plat-orion: use void __iomem pointers for MPP functions	2012-09-21 18:04:24 +00:00
mpp.h	ARM: orion: Fix Orion5x GPIO regression from MPP cleanup	2012-02-09 16:16:31 -08:00
pcie.c	ARM: mv78xx0: Move to ID based window creation	2013-08-06 14:10:09 +00:00
rd78x00-masa-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00