From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 13:01:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'mvebu/for-next'
X-Git-Tag: next-20131024~20
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=3a7f8b4eeeb3c4ce1707a921416f9e2b10573c95

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

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

3a7f8b4eeeb3c4ce1707a921416f9e2b10573c95
diff --cc arch/arm/mach-kirkwood/board-dt.c
index 9caa4fe95913,44bc6b997a09..ab2e586e04c7
--- a/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"