From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 2 Jul 2012 21:14:29 +0000 (+0200)
Subject: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
X-Git-Tag: v3.5-rc6~11^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d19550e5b8aecf6e4b93bfeeb3e8be70e49f5b0e;p=users%2Fhch%2Fxfs.git

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
---

d19550e5b8aecf6e4b93bfeeb3e8be70e49f5b0e