]> Pileus Git - ~andy/linux/commitdiff
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)
* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: pxa: hx4700: Fix basic suspend/resume


Trivial merge