Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c
index 2ffb34af4c59..c0504a8a5079 100644
--- a/drivers/video/omap/blizzard.c
+++ b/drivers/video/omap/blizzard.c
@@ -397,8 +397,7 @@ static inline void free_req(struct blizzard_request *req)
 
         spin_lock_irqsave(&blizzard.req_lock, flags);
 
-        list_del(&req->entry);
-        list_add(&req->entry, &blizzard.free_req_list);
+        list_move(&req->entry, &blizzard.free_req_list);
         if (!(req->flags & REQ_FROM_IRQ_POOL))
                 up(&blizzard.req_sema);
 
@@ -1590,7 +1589,7 @@ static int blizzard_init(struct omapfb_device *fbdev, int ext_mode,
         blizzard.auto_update_window.width = fbdev->panel->x_res;
         blizzard.auto_update_window.height = fbdev->panel->y_res;
         blizzard.auto_update_window.out_x = 0;
-        blizzard.auto_update_window.out_x = 0;
+        blizzard.auto_update_window.out_y = 0;
         blizzard.auto_update_window.out_width = fbdev->panel->x_res;
         blizzard.auto_update_window.out_height = fbdev->panel->y_res;
         blizzard.auto_update_window.format = 0;