]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55a9e7c 9ceb389)
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorOlof Johansson <olof@lixom.net>
Thu, 26 Sep 2013 04:09:59 +0000 (21:09 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 26 Sep 2013 04:09:59 +0000 (21:09 -0700)
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>

Trivial merge
Linux kernel for KaRo TX COM modules