From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 24 Oct 2011 14:20:43 +0000 (+0200)
Subject: Merge branch 'for-3.2/drivers' into for-next
X-Git-Tag: next-20111025~48^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7770b19110f0f0cceb285fc4f2d52ca2b43202d9;p=karo-tx-linux.git

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

Conflicts:
	drivers/block/loop.c

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

7770b19110f0f0cceb285fc4f2d52ca2b43202d9
diff --cc drivers/block/loop.c
index 157ddcb9d0a5,9b2f5d3c19ab..aa65eedaad9d
--- a/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;