diff --git a/[refs] b/[refs]
index 5a0fdea73b21..2d83e052d153 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3171470565cb422f295b18a92d0a9137a3ad5266
+refs/heads/master: a8e14b950c9a9e2ec703df610e00ae8581040517
diff --git a/trunk/block/Kconfig.iosched b/trunk/block/Kconfig.iosched
index 903f0d3b6852..7e803fc88770 100644
--- a/trunk/block/Kconfig.iosched
+++ b/trunk/block/Kconfig.iosched
@@ -16,10 +16,10 @@ config IOSCHED_AS
 	tristate "Anticipatory I/O scheduler"
 	default y
 	---help---
-	  The anticipatory I/O scheduler is the default disk scheduler. It is
-	  generally a good choice for most environments, but is quite large and
-	  complex when compared to the deadline I/O scheduler, it can also be
-	  slower in some cases especially some database loads.
+	  The anticipatory I/O scheduler is generally a good choice for most
+	  environments, but is quite large and complex when compared to the
+	  deadline I/O scheduler, it can also be slower in some cases
+	  especially some database loads.
 
 config IOSCHED_DEADLINE
 	tristate "Deadline I/O scheduler"
@@ -38,6 +38,7 @@ config IOSCHED_CFQ
 	  The CFQ I/O scheduler tries to distribute bandwidth equally
 	  among all processes in the system. It should provide a fair
 	  working environment, suitable for desktop systems.
+	  This is the default I/O scheduler.
 
 choice
 	prompt "Default I/O scheduler"