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>