| commit | d19550e5b8aecf6e4b93bfeeb3e8be70e49f5b0e | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Jul 02 23:14:29 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Jul 02 23:14:29 2012 +0200 |
| tree | d8bd3492313c8b9e51c97cc72293ef9a71de3f29 | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 [diff] | |
| parent | 6416c0409dda00aa66b2a4615044fb59d80f6bb2 [diff] |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes * 'fixes' of git://github.com/hzhuang1/linux: ARM: pxa: hx4700: Fix basic suspend/resume