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

diff --cc drivers/block/loop.c
Simple merge

diff --cc include/linux/loop.h
index ca3c2fca3d3f06fb17040556dcbdc4295131f453,a06880689115ded34b73c39443004638635f2d3b..11a41a8f08eb9e98cb1105982d093c3d075d5206
--- 1/include/linux/loop.h
--- 2/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 */