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

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

d68281b72a9fd7fff0de1259acf7518c32092d63
diff --cc include/linux/loop.h
index ca3c2fca3d3f,a06880689115..11a41a8f08eb
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@@ -73,9 -73,7 +73,8 @@@ struct loop_device 
   */
  enum {
  	LO_FLAGS_READ_ONLY	= 1,
- 	LO_FLAGS_USE_AOPS	= 2,
  	LO_FLAGS_AUTOCLEAR	= 4,
 +	LO_FLAGS_PARTSCAN	= 8,
  };
  
  #include <asm/posix_types.h>	/* for __kernel_old_dev_t */