Merge branch 'sunxi/fixes-for-3.18' into HEAD
authorMaxime Ripard <[email protected]>
Mon, 17 Nov 2014 16:02:46 +0000 (17:02 +0100)
committerMaxime Ripard <[email protected]>
Mon, 17 Nov 2014 16:02:46 +0000 (17:02 +0100)
1  2 
arch/arm/boot/dts/sun6i-a31.dtsi

Simple merge