]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commit46a3b0aa93a99de341e0ee0d8ecede3843780835
tree3b85bf926123025fa6c5d10afdad7ad687f39829
parent025304a517dce66b270f89a5d6a82191dd3838c6
parent81265dfb1ccba0941e54a61c2473befe8c09edc0
Merge tag 'sunxi-core-for-3.11-2' of git://github.com/mripard/linux into next/soc

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>