From: Rafael J. Wysocki Date: Wed, 18 Jul 2012 21:58:24 +0000 (+0200) Subject: Merge branch 'fixes' into pm-sleep X-Git-Tag: next-20120724~40^2~7^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=823d93640927d739f7c918b73fe5ec494fb27e17;p=karo-tx-linux.git Merge branch 'fixes' into pm-sleep The 'fixes' branch contains material the next commit depends on. --- 823d93640927d739f7c918b73fe5ec494fb27e17