projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d70f8c 510fcb0)
Merge branch 'upload/fix' of git://github.com/hzhuang1/linux into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 13:52:25 +0000 (05:52 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 13:52:25 +0000 (05:52 -0800)
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


Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules