Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
	arch/arm/mach-kirkwood/board-dt.c

diff --cc arch/arm/mach-kirkwood/board-dt.c
index 9caa4fe95913c672a6b874c5b8b8d573294ae857,44bc6b997a099d3fa09abb26ef370d9bd581895b..ab2e586e04c7bbf880310304be99d26f4dbaf77f
--- 1/arch/arm/mach-kirkwood/board-dt.c
--- 2/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@@ -17,14 -19,10 +19,9 @@@
  #include <linux/of_net.h>
  #include <linux/of_platform.h>
  #include <linux/clk-provider.h>
- #include <linux/dma-mapping.h>
- #include <linux/irqchip.h>
- #include <linux/kexec.h>
 -#include <linux/clocksource.h>
+ #include <linux/slab.h>
  #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
  #include <mach/bridge-regs.h>
- #include <linux/platform_data/usb-ehci-orion.h>
- #include <plat/irq.h>
  #include <plat/common.h>
  #include "common.h"