tree 971c4f8cdd3e5f6f93f46fbcddd37a736f706c78
parent c911a3169ed81bbda023740b76457aa795a4f910
parent f63870924f83ebb66b5eb8fb8dde83bf9be252cc
author Arnd Bergmann <arnd@arndb.de> 1341413694 +0200
committer Arnd Bergmann <arnd@arndb.de> 1341413694 +0200

Merge branch 'prima2/pinctrl' into next/pinctrl

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