From: Olof Johansson <olof@lixom.net>
Date: Thu, 26 Sep 2013 04:09:59 +0000 (-0700)
Subject: Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
X-Git-Tag: next-20130927~18^2~4^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=66583ec75570b33edcec27e40941b4235189b3d8;p=karo-tx-linux.git

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

From Nicolas Ferre, first fixes series for 3.12:
- removal of void IRQF_DISABLED flag in timer drivers
- two little fixes in DT for at91sam9x5 family

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: remove IRQF_DISABLED
  ARM: at91: at91sam9x5: set default mmc[01] pinctrl-names
  ARM: at91: serial: fix wrong pinctrl_usart2_rts

Signed-off-by: Olof Johansson <olof@lixom.net>
---

66583ec75570b33edcec27e40941b4235189b3d8