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)
commit8ee41a62a3800b8450985d2970fd985421ad7043
tree971c4f8cdd3e5f6f93f46fbcddd37a736f706c78
parentc911a3169ed81bbda023740b76457aa795a4f910
parentf63870924f83ebb66b5eb8fb8dde83bf9be252cc
Merge branch 'prima2/pinctrl' into next/pinctrl

* prima2/pinctrl:
  ARM: prima2: enable gpiolib unconditionally