Merge branch 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms...
authorOlof Johansson <olof@lixom.net>
Tue, 28 Aug 2012 00:07:45 +0000 (17:07 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 28 Aug 2012 00:07:45 +0000 (17:07 -0700)
commitaa9f6d6b1be17fb84cd62e19f8d997b378b1c852
tree2a6389c867b74d05f7b9e2017c6ec9861fd2b350
parent981ba65715f28c5d0247c71e49e2917f40b61632
parent5c1d2d16772e2d7d4e2e8da99a92d6f50b9102f0
Merge branch 'armadillo800eva' of git://git./linux/kernel/git/horms/renesas into fixes

* 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
  ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions