diff --git a/[refs] b/[refs]
index dbe786a2ec98..329644d5d1d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d3bfdda15d2019a3c2c91c9043ee4c3f5627708
+refs/heads/master: b66848eb85c2a646c852ea4644f43e1a86517245
diff --git a/trunk/drivers/staging/omapdrm/omap_plane.c b/trunk/drivers/staging/omapdrm/omap_plane.c
index 55ddc580fe68..9b3bfa02a91c 100644
--- a/trunk/drivers/staging/omapdrm/omap_plane.c
+++ b/trunk/drivers/staging/omapdrm/omap_plane.c
@@ -439,7 +439,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
 	if (priv)
 		omap_plane->info.zorder = 0;
 	else
-		omap_plane->info.zorder = 1;
+		omap_plane->info.zorder = ovl->id;
 
 	update_manager(plane);