From: Olof Johansson <olof@lixom.net>
Date: Thu, 12 Dec 2013 00:35:56 +0000 (-0800)
Subject: Merge branch 'fixes' into for-next
X-Git-Tag: next-20131213~103^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d6db2fee1ea7be33fd644170358bce02f60e0bd8;p=karo-tx-linux.git

Merge branch 'fixes' into for-next

* fixes:
  ARM: pxa: prevent PXA270 occasional reboot freezes
  ARM: pxa: tosa: fix keys mapping
---

d6db2fee1ea7be33fd644170358bce02f60e0bd8