From: Olof Johansson <olof@lixom.net>
Date: Wed, 5 Sep 2012 23:27:49 +0000 (-0700)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20120906~13^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=77f8e317b375949c5fba9126413385fd562f1ccd;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next

* next/dt: (66 commits)
  pinctrl: sirf: add DT-binding pinmux mapping support
  ARM: PRIMA2: rename prima2-cb.dts to prima2.dtsi as it only has SoC features
  ARM: PRIMA2: add missing interrupts property for pinctrl node
  + sync to 3.6-rc4
---

77f8e317b375949c5fba9126413385fd562f1ccd
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 99f1a5fcc0ff,000000000000..95226d490cf6
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,53 -1,0 +1,54 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +It also includes a couple of directly applied patches for build breaks with subject
 +The next/* branches are kept in the order in which they get applied.
 +
 +fixes:
 +
 +next/fixes-non-critical:
 +ux500/fixes-non-critical http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-updates
 +
 +next/cleanup:
 +cleanup/io-pci:   git://sources.calxeda.com/kernel/linux.git io-cleanup-pci-v2
 +bcmring/cleanup:  patches from Arnd
 +u300/cleanup	  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git u300-cleanup
 +csr/marco-prepare git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git marco-prepare
 +			(includes two patches from clk-next that adds prima2 clocks)
 +pmu/cleanup       git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git tags/arm-perf-3.7
 +ks8695/timer      http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ks8695-time-for-arm-soc
 +renesas/ag5evm    git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git ag5evm
 +nxp4008/removal   git://git.antcom.de/linux-2.6.git pnx4008-removal
 +
 +next/maintainers:
 +
 +next/soc:
 +ux500/asic-id:	git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core
 +		 + http://marc.info/?l=linux-arm-kernel&m=134667789927502
 +renesas/kzm9g   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git kzm9g
 +
 +next/dt:
 +pxa/dt:		git://github.com/hzhuang1/linux.git dt
 +renesas/soc-core git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc-core
++csr/pinmux-dt   git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git pinmux-dt
 +
 +
 +next/defconfig:
 +
 +next/drivers:
 +devel/led-driver	git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git for-arm-soc
 +at91/mci	git://github.com/at91linux/linux-at91 at91-for-next-soc
 +drivers/ocp2scp	patches from Kishon Vijay Abraham I <kishon@ti.com>
 +		+ http://marc.info/?l=linux-next&m=134574365000518&w=2
 +
 +next/boards:
 +pxa/board	git://github.com/hzhuang1/linux.git board
 +
 +next/docs:
 +mvebu/docs:	git://github.com/MISL-EBU-System-SW/mainline-public.git marvell-doc
 +
 +
 +
 +
 +