diff options
| author | Olof Johansson <olof@lixom.net> | 2012-08-27 17:07:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-08-27 17:07:45 -0700 |
| commit | aa9f6d6b1be17fb84cd62e19f8d997b378b1c852 (patch) | |
| tree | 2a6389c867b74d05f7b9e2017c6ec9861fd2b350 /fs/ufs | |
| parent | 981ba65715f28c5d0247c71e49e2917f40b61632 (diff) | |
| parent | 5c1d2d16772e2d7d4e2e8da99a92d6f50b9102f0 (diff) | |
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
Diffstat (limited to 'fs/ufs')
0 files changed, 0 insertions, 0 deletions