]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fixes' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 12 Dec 2013 00:35:56 +0000 (16:35 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 12 Dec 2013 00:35:56 +0000 (16:35 -0800)
* fixes:
  ARM: pxa: prevent PXA270 occasional reboot freezes
  ARM: pxa: tosa: fix keys mapping


Trivial merge