Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2...
authorArnd Bergmann <arnd@arndb.de>
Mon, 2 Jul 2012 21:03:51 +0000 (23:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 2 Jul 2012 21:05:04 +0000 (23:05 +0200)
* 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel:
  PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <inus.walleij@linaro.org>

Trivial merge