From: Olof Johansson <olof@lixom.net>
Date: Tue, 28 Aug 2012 00:07:45 +0000 (-0700)
Subject: Merge branch 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms... 
X-Git-Tag: v3.6-rc5~6^2~4
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=aa9f6d6b1be17fb84cd62e19f8d997b378b1c852;p=cascardo%2Flinux.git

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
---

aa9f6d6b1be17fb84cd62e19f8d997b378b1c852