]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorArnd Bergmann <arnd@arndb.de>
Thu, 14 Mar 2013 22:55:59 +0000 (23:55 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 14 Mar 2013 22:55:59 +0000 (23:55 +0100)
From Nicolas Ferre <nicolas.ferre@atmel.com>:

Two patches for Device Tree on at91sam9x5/NAND.
Two more for fixing PM suspend/resume IRQ on AIC5 and
GPIO used with pinctrl.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: fix infinite loop in at91_irq_suspend/resume
  ARM: at91: add gpio suspend/resume support when using pinctrl
  ARM: at91: dt: at91sam9x5: complete NAND pinctrl
  ARM: at91: dt: at91sam9x5: correct NAND pins comments

Includes an update to -rc2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge