Merge branch 'next/cleanup' into for-next

Conflicts:
	arch/arm/mach-spear/spear13xx.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index f54e9d4a511f0e794b25bcb0351b83959530c3f1,0000000000000000000000000000000000000000..822d4a20684f56d64eb9b6ffefd2f9ec77af5074
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,36 -1,0 +1,38 @@@
 +for-next contents for 3.10: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +next/fixes-non-critical
 +      ux500/dt-fixes
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-fixes
 +
 +next/cleanup
 +      samsung/cleanup-s3c
 +                git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s3c
 +      samsung/cleanup-s5p
 +                git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s5p
++      clksrc/cleanup
++                git://sources.calxeda.com/kernel/linux.git tags/clksrc-cleanup-for-3.10
 +
 +next/multiplatform
 +      nomadik/multiplatform
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-multiplatform
 +      spear/multiplatform
 +              patches <1363106816-9603-1-git-send-email-arnd@arndb.de>
 +      cns3xxx/multiplatform
 +              patches <1363299271-8283-1-git-send-email-arnd@arndb.de>
 +
 +next/drivers
 +      samsung/timer
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/timer-samsung
 +              depends on samsung/cleanup-s3c
 +      samsung/irq-s3c24xx
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/irq-s3c24xx
 +      samsung/pinctrl-exynos
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/pinctrl-exynos
 +

diff --cc arch/arm/mach-spear/spear13xx.c
index 1b97e8623472806850743e43e72206f638748f74,25a10191b0218afb8ebbebe8a463ccf7cd869ea9..6dd2089971765fe65189b7f1e44cfcdf84e4fa5f
--- 1/arch/arm/mach-spear/spear13xx.c
--- 2/arch/arm/mach-spear13xx/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@@ -20,12 -21,10 +21,11 @@@
  #include <linux/of.h>
  #include <asm/hardware/cache-l2x0.h>
  #include <asm/mach/map.h>
- #include <asm/smp_twd.h>
 -#include <mach/dma.h>
 -#include <mach/generic.h>
 +#include "generic.h"
  #include <mach/spear.h>
  
 +#include "spear13xx-dma.h"
 +
  /* common dw_dma filter routine to be used by peripherals */
  bool dw_dma_filter(struct dma_chan *chan, void *slave)
  {