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


Trivial merge