Merge branch 'fixes' into pm-sleep
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 18 Jul 2012 21:58:24 +0000 (23:58 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 18 Jul 2012 21:58:24 +0000 (23:58 +0200)
commit823d93640927d739f7c918b73fe5ec494fb27e17
treedea028ddd214541b76c1c26f5f21ddc46157e67e
parent7664e969359917ba3212c5d6efdec494eaf8586e
parentd9914cf66181b8aa0929775f5c6f675c6ebc3eb5
Merge branch 'fixes' into pm-sleep

The 'fixes' branch contains material the next commit depends on.