From: Arnd Bergmann Date: Wed, 4 Jul 2012 14:54:54 +0000 (+0200) Subject: Merge branch 'prima2/pinctrl' into next/pinctrl X-Git-Tag: next-20120724~11^2~6^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8ee41a62a3800b8450985d2970fd985421ad7043;p=karo-tx-linux.git Merge branch 'prima2/pinctrl' into next/pinctrl * prima2/pinctrl: ARM: prima2: enable gpiolib unconditionally --- 8ee41a62a3800b8450985d2970fd985421ad7043