Merge branch 'for-3.2/drivers' into for-next

Conflicts:
	drivers/block/loop.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc block/genhd.c
Simple merge

diff --cc drivers/block/loop.c
index 157ddcb9d0a54e3c8b7e70e65a501590d91c5b76,9b2f5d3c19abc96c1c594dd6d247140c64728086..aa65eedaad9db9dcb90cd7f8dfae3118b696f4cc
--- 1/drivers/block/loop.c
--- 2/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@@ -75,11 -75,12 +75,13 @@@
  #include <linux/kthread.h>
  #include <linux/splice.h>
  #include <linux/sysfs.h>
 +#include <linux/miscdevice.h>
+ #include <linux/falloc.h>
+ 
  #include <asm/uaccess.h>
  
 -static LIST_HEAD(loop_devices);
 -static DEFINE_MUTEX(loop_devices_mutex);
 +static DEFINE_IDR(loop_index_idr);
 +static DEFINE_MUTEX(loop_index_mutex);
  
  static int max_part;
  static int part_shift;

diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/scsi/hpsa.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

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