Merge commit 'v3.3-rc4'

2012-02-21 09:32:19 +02:00
parent 5e36097889 b01543dfe6
commit 3f60db4bde
1242 changed files with 11111 additions and 53498 deletions
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -720,7 +720,7 @@ void dss_runtime_put(void)

 	DSSDBG("dss_runtime_put\n");

-	r = pm_runtime_put(&dss.pdev->dev);
+	r = pm_runtime_put_sync(&dss.pdev->dev);
 	WARN_ON(r < 0);
 }