]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
Merge tag 'sunxi-core-for-3.11-2' of git://github.com/mripard/linux into next/soc
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:34:33 +0000 (15:34 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 13:34:33 +0000 (15:34 +0200)
From Maxime Ripard:

Allwinner platform additions, take 2

Adds machine support for the Allwinner A10s SoC

* tag 'sunxi-core-for-3.11-2' of git://github.com/mripard/linux:
  ARM: sunxi: Add Allwinner A10s machine compatible

Depends on the sunxi/cleanup branch

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

Trivial merge