Merge branch 'prima2/pinctrl' into next/pinctrl
authorArnd Bergmann <arnd@arndb.de>
Wed, 4 Jul 2012 14:54:54 +0000 (16:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 4 Jul 2012 14:54:54 +0000 (16:54 +0200)
* prima2/pinctrl:
  ARM: prima2: enable gpiolib unconditionally


Trivial merge