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
This commit is contained in:
Arnd Bergmann 2012-07-02 23:14:29 +02:00
commit d19550e5b8