Merge tag 'pxa' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux...
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 18:48:20 +0000 (11:48 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 18:48:32 +0000 (11:48 -0700)
commitb889f2d764c0d9f3ef1b77cfe3dac87493e12469
tree1f5d224df71d6b5b21221fdd1523229cb235fe77
parentb3e2e24348e3d5bf92bca4cecc09889f0969b868
parentdc5dfab4ed18f0756f304dc5699b5743ddf56f90
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>