From: Olof Johansson <olof@lixom.net>
Date: Thu, 12 Dec 2013 01:34:33 +0000 (-0800)
Subject: Merge branches 'next/cleanup' and 'next/dt' into for-next
X-Git-Tag: next-20131213~103^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74787d3db4580713c79bd6d03942fd33606926cc;p=karo-tx-linux.git

Merge branches 'next/cleanup' and 'next/dt' into for-next

* next/cleanup:
  ARM: mmp: build sram driver alone
  ARM: pxa: Remove unused variables
  ARM: pxa: remove IRQF_DISABLED

* next/dt:
  ARM: pxa: add PWM nodes to pxa27x.dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>
---

74787d3db4580713c79bd6d03942fd33606926cc
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 81c635651802,000000000000,000000000000..67b8fb8e3e1c
mode 100644,000000,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@@ -1,52 -1,0 -1,0 +1,57 @@@@
 ++Contents of arm-soc branches contained in for-next
 ++
 ++
 ++next/cleanup
 ++	renesas/cleanup
 ++		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.14
 ++	mvebu/soc
 ++		git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14
 ++	at91/sama5-ccf
 ++		git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 ++	patches
 ++		ARM: at91: remove redundant dependency
 ++		ARM: clean up cache handling in platform code
+++		ARM: pxa: Remove unused variables
+++		ARM: pxa: remove IRQF_DISABLED
+++		ARM: mmp: build sram driver alone
 ++
 ++next/soc
 ++	patches
 ++		ARM: ep93xx: remove deprecated IRQF_DISABLED
 ++		ARM: ep93xx: use soc bus
 ++	soc/sched_clock
 ++		local branch: rebased onto tip/timers-core-for-linus for dependencies
 ++	patch
 ++		ARM: at91: sama5d3: add support for sama5d36 chip
 ++
 ++next/dt
 ++	ux500/dt
 ++		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-devicetree-v3.14-1
 ++	mvebu/dt
 ++		git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14
 ++	sti/dt
 ++		http://git.stlinux.com/devel/kernel/linux-sti.git tags/DT-for-v3.14-part-1
 ++	mvebu/dt-2
 ++		git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-2		
 ++	patch
 ++		ARM: at91: sama5d3/dt: add sama5d36ek dts files (based on next/cleanup for dependencies)
 ++	at91/dt
 ++		git://github.com/at91linux/linux-at91.git tags/at91-dt
 ++	integrator/dt
 ++		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-v3.14-1
+++	patches
+++		ARM: pxa: add PWM nodes to pxa27x.dtsi
 ++
 ++next/boards
 ++	renesas/defconfig
 ++		git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.14
 ++	mvebu/defconfig
 ++		git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14
 ++	patch
 ++		ARM: multi_v7_defconfig: Fix STi support
 ++
 ++next/drivers
 ++	mvebu/drivers
 ++		git://git.infradead.org/linux-mvebu.git tags/mvebu-drivers-3.14
 ++	samsung/s3c64xx-dmaengine
 ++		git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/s3c64xx-dmaengine