From: Olof Johansson Date: Fri, 24 May 2013 20:17:49 +0000 (-0700) Subject: Merge tag 'sunxi-fixes-for-3.10' of git://github.com/mripard/linux into fixes X-Git-Tag: v3.10-rc3~13^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f4ae176c626311d6507c9a2d263657c4cc4e1667;p=~emulex%2Finfiniband.git 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 --- f4ae176c626311d6507c9a2d263657c4cc4e1667