tree d8bd3492313c8b9e51c97cc72293ef9a71de3f29
parent 6887a4131da3adaab011613776d865f4bcfb5678
parent 6416c0409dda00aa66b2a4615044fb59d80f6bb2
author Arnd Bergmann <arnd@arndb.de> 1341263669 +0200
committer Arnd Bergmann <arnd@arndb.de> 1341263669 +0200

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