Merge branch 'master' of goat:git/vdummy

diff --cc vdummy.c
index 565a6b8,a4d05b8..b434b6f
--- 1/vdummy.c
--- 2/vdummy.c
+++ b/vdummy.c
@@@ -411,10 -414,9 +424,11 @@@ static int update_frame(int xsz, int ys
  static int gen_frame(void)
  {
        struct buffer *buf = 0;
+       unsigned long flags;
  
 +      printk(KERN_INFO "vdummy: gen_frame\n");
 +
-       spin_lock(&blist_lock);
+       spin_lock_irqsave(&blist_lock, flags);
        if(buflist) {
                buf = buflist;
                buflist = buflist->next;