diff --git a/[refs] b/[refs]
index 2e932c18c202..84da0395ba84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f34ee75decb80007ba77bba5a7384eadff4866d
+refs/heads/master: b17fd9bceb99610f6dc7998c9a4ed6b71520be2b
diff --git a/trunk/block/Kconfig.iosched b/trunk/block/Kconfig.iosched
index f3b7753aac99..48d090e266fc 100644
--- a/trunk/block/Kconfig.iosched
+++ b/trunk/block/Kconfig.iosched
@@ -40,7 +40,7 @@ config IOSCHED_CFQ
 
 choice
 	prompt "Default I/O scheduler"
-	default DEFAULT_AS
+	default DEFAULT_CFQ
 	help
 	  Select the I/O scheduler which will be used by default for all
 	  block devices.