From: Olof Johansson <olof@lixom.net>
Date: Tue, 6 Nov 2012 13:52:25 +0000 (-0800)
Subject: Merge branch 'upload/fix' of git://github.com/hzhuang1/linux into fixes
X-Git-Tag: v3.7-rc6~6^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9d6163aaea4e3ddc1172b7a2d7535668cf51c795;p=~emulex%2Finfiniband.git

Merge branch 'upload/fix' of git://github.com/hzhuang1/linux into fixes

From Haojian Zhuang:

* 'upload/fix' of git://github.com/hzhuang1/linux:
  ARM: pxa/spitz_pm: Fix hang when resuming from STR
  ARM: pxa: hx4700: Fix backlight PWM device number
---

9d6163aaea4e3ddc1172b7a2d7535668cf51c795