]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2440f36c2874ce51241b024a59e2eaf7a1505bd0
tree2a6389c867b74d05f7b9e2017c6ec9861fd2b350
parentd11225cb13564954fd6a66d5fcc7090b2e7cd919
parentb809afe2ad6cbcdea412f8f0261764211096fbac
Merge branch 'armadillo800eva' of git://git.kernel.org/pub/scm/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