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)
* 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>

Trivial merge