Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Mon, 2 Jul 2012 21:14:29 +0000 (23:14 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 2 Jul 2012 21:14:29 +0000 (23:14 +0200)
commitd19550e5b8aecf6e4b93bfeeb3e8be70e49f5b0e
treed8bd3492313c8b9e51c97cc72293ef9a71de3f29
parent6887a4131da3adaab011613776d865f4bcfb5678
parent6416c0409dda00aa66b2a4615044fb59d80f6bb2
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