| commit | 66583ec75570b33edcec27e40941b4235189b3d8 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Sep 25 21:09:59 2013 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed Sep 25 21:09:59 2013 -0700 |
| tree | 4ec0ea27a20ff58dbbd025f50f48787542801817 | |
| parent | 55a9e7c8a69158358f53fc94537f1076ad7fe322 [diff] | |
| parent | 9ceb389dddbcdb87830f01fcf84d94b2da581dae [diff] |
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>