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	ARM: drop <mach/timex.h> for !ARCH_MULTIPLATFORM, too	2013-12-20 17:17:16 +01:00
Kconfig	ARM: mvebu: move DT Dove to MVEBU	2014-03-04 04:13:48 +00:00
Makefile	ARM: mvebu: move DT Dove to MVEBU	2014-03-04 04:13:48 +00:00
Makefile.boot	ARM: kirkwood: move new dtbs to common Makefile	2012-09-22 14:24:00 -07:00
cm-a510.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
common.c	ARM: Dove: Fix compiler warnings with C=1 builds	2013-11-24 02:36:55 +00:00
common.h	reboot: arm: change reboot_mode to use enum reboot_mode	2013-07-09 10:33:29 -07:00
dove-db-setup.c	ARM: delete struct sys_timer	2012-12-24 09:36:38 -07:00
irq.c	Dove: Attempt to fix PMU/RTC interrupts	2012-11-21 18:25:11 +00:00
mpp.c	ARM: dove: fix missing __init section of dove_mpp_gpio_mode	2013-07-25 15:22:17 +00:00
mpp.h	ARM: dove: Consolidate mpp code with platform mpp.	2011-05-16 15:49:31 -04:00
pcie.c	ARM: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00