Merge branch 'prima2/drivers' of...

Merge branch 'prima2/drivers' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/pinctrl

* '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>