tree dea028ddd214541b76c1c26f5f21ddc46157e67e
parent 7664e969359917ba3212c5d6efdec494eaf8586e
parent d9914cf66181b8aa0929775f5c6f675c6ebc3eb5
author Rafael J. Wysocki <rjw@sisk.pl> 1342648704 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1342648704 +0200

Merge branch 'fixes' into pm-sleep

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