]> 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)
commit106a101f8a75846ad8081ed0a64651ae73099333
tree2a6389c867b74d05f7b9e2017c6ec9861fd2b350
parent02e749bcdc7a4d0aee0547e6463ea706218e5573
parentcb9933440123e49a0de06fd43c10e1e92272c47c
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