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)
commit7ac6c89189c669fd5f883937f291f18d324d470b
tree5f0712bdedac45a40148ede0064d4e6eddb4260e
parent6fdd496e07f511a94ba27e4a1433038b32d6af05
parent0ed66befaae893e82c9f016238282d73ef9fd6c7
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

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>