Merge branch 3.0.13 stable into uek2-stable

Conflicts:
	drivers/scsi/mpt2sas/mpt2sas_scsih.c (commit: 2a31a73f)

diff --cc fs/block_dev.c
index bbb71d9d5e9bf3570f7c43fb85768317a6b797fa,34503ba6c07770a00eb67a0c9247689ab206b4c6..4531a0eb16e28fb3e569e214431bcc16d01e77af
--- 1/fs/block_dev.c
--- 2/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -1126,11 -1127,10 +1128,11 @@@ static int __blkdev_get(struct block_de
                                        disk_put_part(bdev->bd_part);
                                        bdev->bd_part = NULL;
                                        bdev->bd_disk = NULL;
 +                                      bdev->bd_queue = NULL;
                                        mutex_unlock(&bdev->bd_mutex);
                                        disk_unblock_events(disk);
-                                       module_put(disk->fops->owner);
                                        put_disk(disk);
+                                       module_put(owner);
                                        goto restart;
                                }
                        }

diff --cc include/linux/vmalloc.h
Simple merge

diff --cc mm/vmalloc.c
Simple merge