Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
  Documentation/kernel-docs.txt update.
  arch/cris: typo in KERN_INFO
  Storage class should be before const qualifier
  kernel/printk.c: comment fix
  update I/O sched Kconfig help texts - CFQ is now default, not AS.
  Remove duplicate listing of Cris arch from README
  kbuild: more doc. cleanups
  doc: make doc. for maxcpus= more visible
  drivers/net/eexpress.c: remove duplicate comment
  add a help text for BLK_DEV_GENERIC
  correct a dead URL in the IP_MULTICAST help text
  fix the BAYCOM_SER_HDX help text
  fix SCSI_SCAN_ASYNC help text
  trivial documentation patch for platform.txt
  Fix typos concerning hierarchy
  Fix comment typo "spin_lock_irqrestore".
  Fix misspellings of "agressive".
  drivers/scsi/a100u2w.c: trivial typo patch
  Correct trivial typo in log2.h.
  Remove useless FIND_FIRST_BIT() macro from cardbus.c.
  ...

1 files changed, 5 insertions, 4 deletions

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 903f0d3b6852..7e803fc88770 100644
--- a/block/Kconfig.iosched
+++ b/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"