Commits
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