From: Arnd Bergmann 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: firefly_0821_release~3680^2~2486^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d19550e5b8aecf6e4b93bfeeb3e8be70e49f5b0e;p=firefly-linux-kernel-4.4.55.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