From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 14 Mar 2013 22:55:59 +0000 (+0100)
Subject: Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
X-Git-Tag: MMI-PSA29.97-13-9~14803^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ac6c89189c669fd5f883937f291f18d324d470b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

7ac6c89189c669fd5f883937f291f18d324d470b