Merge branch 'postmerge' into for-linus

Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --cc drivers/scsi/sd.c
index 196240dcf26e4c7c2192f78682a40b750e3fd51f,5000bec71686a82a122ddce429fdbbdbc4b2bc6d..c1c555242d0d715d46c051955deacea4a819d634
--- 1/drivers/scsi/sd.c
--- 2/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1220,8 -1199,8 +1214,7 @@@ static void sd_release(struct gendisk *
         * XXX is followed by a "rmmod sd_mod"?
         */
  
-       scsi_autopm_put_device(sdev);
        scsi_disk_put(sdkp);
 -      return 0;
  }
  
  static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)