Merge tag 'sunxi-fixes-for-3.8-rc2' of git://github.com/mripard/linux into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 28 Dec 2012 07:53:01 +0000 (08:53 +0100)
committerOlof Johansson <olof@lixom.net>
Fri, 28 Dec 2012 07:53:01 +0000 (08:53 +0100)
commit2e376799b2f6af2e8baeb407b6437a4d7b650ac0
tree414e4b844580de1d6489cb6e5d308be65cc1b22b
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565
parent43880f709dc59840849e31b01735ac587195ef8a
Merge tag 'sunxi-fixes-for-3.8-rc2' of git://github.com/mripard/linux into fixes

From Maxime Ripard:
Fixes for the sunxi core to be merged in 3.8-rc2

* tag 'sunxi-fixes-for-3.8-rc2' of git://github.com/mripard/linux:
  sunxi: Change the machine compatible string.
  ARM: multi_v7_defconfig: Add ARCH_SUNXI