Merge tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux into next/soc
authorKevin Hilman <khilman@linaro.org>
Wed, 21 Aug 2013 23:24:22 +0000 (16:24 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 21 Aug 2013 23:24:22 +0000 (16:24 -0700)
commitfe870ae70bda4bb19ae6920a62e7d05f1dde9b2b
tree5d4aef6d341f84aef6c09a8025004c954fd3f792
parentf7b29518c33a0fe48cf13b7e2eb04a5fdb11293d
parentd18fd9445b18c4adf56cfc58c378c702c8edd0da
Merge tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux into next/soc

Allwinner sunXi core additions for 3.12, take 2

These patches add machine support for the Allwinner A20 and A31 SoCs

* tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux:
  ARM: sunxi: Introduce Allwinner A20 support
  ARM: sun6i: Add restart code for the A31
  ARM: sunxi: Add the Allwinner A31 compatible to the machine definition