Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 98f24f0ec00..924d7946278 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -1540,9 +1540,6 @@ static int sm501fb_init_fb(struct fb_info *fb,
         if (ret)
                 dev_err(info->dev, "check_var() failed on initial setup?\n");
 
-        /* ensure we've activated our new configuration */
-        (fb->fbops->fb_set_par)(fb);
-
         return 0;
 }
 
@@ -1624,6 +1621,8 @@ static int __devinit sm501fb_start_one(struct sm501fb_info *info,
         if (!fbi)
                 return 0;
 
+        mutex_init(&info->fb[head]->mm_lock);
+
         ret = sm501fb_init_fb(info->fb[head], head, drvname);
         if (ret) {
                 dev_err(info->dev, "cannot initialise fb %s\n", drvname);