From: Kevin Hilman <khilman@linaro.org>
Date: Wed, 21 Aug 2013 23:05:07 +0000 (-0700)
Subject: Merge tag 'sunxi-dt-for-3.12-2' of https://github.com/mripard/linux into next/dt
X-Git-Tag: v3.12-rc1~116^2~6
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=656d79cafc88137c87c0f6ac85080ce5dae2234b;p=~andy%2Flinux

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

Allwinner sunXi DT additions for 3.12, take 2

These patches add basic support for:
  - Allwinner A31 and A20 SoCs
  - The Olimex A20-Olinuxino board
  - The Olimex A10s-Olinuxino board

* tag 'sunxi-dt-for-3.12-2' of https://github.com/mripard/linux:
  ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
  ARM: sun7i: Add Allwinner A20 DTSI
  ARM: sun6i: Add WITS Colombus A31 evaluation kit support
  ARM: sunxi: Add Allwinner A31 DTSI
---

656d79cafc88137c87c0f6ac85080ce5dae2234b