diff --git a/[refs] b/[refs]
index 94cb9a506733..24cf6b01bae0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ef5eb424ebf0cd981192a416358fd707a9f959b
+refs/heads/master: bb7ee9b1ec15358af870a81b0c6a03af29417f99
diff --git a/trunk/Documentation/ioctl/hdio.txt b/trunk/Documentation/ioctl/hdio.txt
index c19efdeace2c..44d283d6b136 100644
--- a/trunk/Documentation/ioctl/hdio.txt
+++ b/trunk/Documentation/ioctl/hdio.txt
@@ -511,9 +511,8 @@ HDIO_DRIVE_RESET		execute a device reset
 
 	notes:
 
-	  Abort any current command, prevent anything else from being
-	  queued, execute a reset on the device, and issue BLKRRPART
-	  ioctl on the block device.
+	  Execute a reset on the device as soon as the current IO
+	  operation has completed.
 
 	  Executes an ATAPI soft reset if applicable, otherwise
 	  executes an ATA soft reset on the controller.