From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 21:46:50 +0000 (+0200)
Subject: Merge tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux into for-next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~41^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cce9e45cfcefb53d48fbb24fe4bbb7469cc1f272;p=pandora-kernel.git

Merge tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux into for-next

Merge "Allwinner DT changes for 3.16, take 2" from Maxime Ripard:

  - Introduction of a new board, the i12-tvbox
  - Enable the MMC and USB controllers on the Colombus
  - Add the enable-method to the A31 cpus
  - a few fixes

* tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux:
  ARM: dts: sun7i: Add new i12-tvbox board
  ARM: dts: sun7i: cubietruck: set mmc3 bus-width property
  ARM: sun6i: Add MMC0 controller to the Colombus board
  ARM: sun6i: Fix OHCI2 node name
  ARM: sun6i: Enable USB Host support on the Colombus board
  ARM: sunxi: Add fixed 3V regulator
  ARM: sun6i: Define the A31 CPUs enable-method
  ARM: sunxi: dt: build DTs according to new MACH_SUNxI Kconfig symbols

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Conflicts:
	arch/arm/boot/dts/Makefile
---

cce9e45cfcefb53d48fbb24fe4bbb7469cc1f272
Reading git-diff-tree failed