From: Olof Johansson <olof@lixom.net>
Date: Mon, 7 Oct 2013 17:24:14 +0000 (-0700)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20131017~12^2~26
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=91a21c7a22ef78232e5b7b7336ff1404de077aa3;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next

* next/dt:
  ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS
  ARM: ux500: register the tc35892 GPIO on the TVK UIB
  ARM: ux500: split the HREF DTS files from two to four
  ARM: ux500: split HREF UIB files
  ARM: ux500: move TC35892 at 0x42 to hrefprev60
  ARM: ux500: correct CD for micro SD on hrev60plus
  ARM: ux500: fix proximity sensor button
  ARM: ux500: correct I2C address of ambient light sensor
  ARM: ux500 enable the AB8500 gpio for all HREFs
  ARM: ux500: add default trigger on HREF LED

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

91a21c7a22ef78232e5b7b7336ff1404de077aa3
diff --cc arch/arm/arm-soc-for-next-contents.txt
index bbc1d4c005a8,000000000000..5edba823f7bb
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,25 -1,0 +1,27 @@@
 +
 +
 +next/cleanup
 +	shark/removal
 +		  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13
 +	cleanup/dt-clock
 +		https://github.com/shesselba/linux-dove.git clk-of-init-v2_for-3.13
 +
 +next/soc
 +	samsung/s3c64xx-clk
 +		http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx
 +	patch
 +		ARM: davinci: remove deprecated IRQF_DISABLED
 +
 +next/drivers
 +	davinci/gpio
 +		git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio
 +
 +next/dt
 +	samsung/s3c64xx-dt
 +		  http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx
 +	ux500/dt
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2
 +		patch "ARM: ux500: enable appended dtb in u8500_defconfig"
++	ux500/dt2
++		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-2
 +