Merge tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 24 May 2013 20:17:49 +0000 (13:17 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 24 May 2013 22:50:28 +0000 (15:50 -0700)
commitf4ae176c626311d6507c9a2d263657c4cc4e1667
tree9eaca6153773efaa1b61b8a68beda4e21a21c851
parent4a0cce791ecc354abc950b530c23c0baa4d628fd
parent19a280a61b520febab0f2fde94f4bd50250377b2
Merge tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux into fixes

From Maxime Ripard:
Small set of fixes for 3.10:
  - Fix build breakage in pinctrl driver when no other architecture is selected
  - Fix Mini X-plus device tree build

* tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux:
  ARM: sunxi: select ARCH_REQUIRE_GPIOLIB
  ARM: sunxi: Fix Mini X-plus device tree build

Signed-off-by: Olof Johansson <olof@lixom.net>