tree 1f5d224df71d6b5b21221fdd1523229cb235fe77
parent b3e2e24348e3d5bf92bca4cecc09889f0969b868
parent dc5dfab4ed18f0756f304dc5699b5743ddf56f90
author Olof Johansson <olof@lixom.net> 1394390900 -0700
committer Olof Johansson <olof@lixom.net> 1394390912 -0700

Merge tag 'pxa' of https://git.kernel.org/pub/scm/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>