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

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 01:08:19 +0000 (11:08 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 30 May 2014 01:08:19 +0000 (11:08 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:08:19 +0000 (11:08 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:08:19 +0000 (11:08 +1000)
diff --cc arch/arm/boot/dts/sun4i-a10.dtsi
Simple merge
diff --cc arch/arm/boot/dts/sun5i-a10s.dtsi
Simple merge
diff --cc arch/arm/boot/dts/sun5i-a13.dtsi
Simple merge
diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:08:19 +0000 (11:08 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 01:08:19 +0000 (11:08 +1000)
		1	2
arch/arm/boot/dts/sun4i-a10.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sun5i-a10s.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sun5i-a13.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/sun7i-a20.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history