From: Olof Johansson <olof@lixom.net>
Date: Sun, 9 Mar 2014 18:48:20 +0000 (-0700)
Subject: Merge tag 'pxa' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b889f2d764c0d9f3ef1b77cfe3dac87493e12469;p=deliverable%2Flinux.git

Merge tag 'pxa' of https://git./linux/kernel/git/hzhuang1/linux into next/boards

* tag 'pxa' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  ARM: pxa: add gpio keys information

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

b889f2d764c0d9f3ef1b77cfe3dac87493e12469