tree 8e05e98068f0380376735a8575af9bb42ab27502
parent ca24a145573124732152daff105ba68cc9a2b545
parent 5130216265f6f924a4ba8214787241be96d93467
author Arnd Bergmann <arnd@arndb.de> 1341263031 +0200
committer Arnd Bergmann <arnd@arndb.de> 1341263104 +0200

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>