Merge branch 'prima2/pinctrl' into next/pinctrl

* prima2/pinctrl:
  ARM: prima2: enable gpiolib unconditionally
This commit is contained in:
Arnd Bergmann 2012-07-04 16:54:54 +02:00
commit 8ee41a62a3