| commit | 9d6163aaea4e3ddc1172b7a2d7535668cf51c795 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Nov 06 05:52:25 2012 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Tue Nov 06 05:52:25 2012 -0800 |
| tree | 8a35b3f3ad076368d2b62489fe01f8c4403b4b96 | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 [diff] | |
| parent | 510fcb0d331f314cd20d0067d56f29302846f47b [diff] |
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