Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-fastboot:
  raid, fastboot: hide RAID autodetect option if MD is compiled as a module
  raid: make RAID autodetect default a KConfig option
  warning: fix init do_mounts_md c
  fastboot: make the RAID autostart code print a message just before waiting
  fastboot: make the raid autodetect code wait for all devices to init
  fastboot: Fix bootgraph.pl initcall name regexp
  fastboot: fix issues and improve output of bootgraph.pl
  Add a script to visualize the kernel boot process / time

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 07d92c11b5d8..2281b5098e95 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -30,6 +30,20 @@ config BLK_DEV_MD
 
           If unsure, say N.
 
+config MD_AUTODETECT
+        bool "Autodetect RAID arrays during kernel boot"
+        depends on BLK_DEV_MD=y
+        default y
+        ---help---
+          If you say Y here, then the kernel will try to autodetect raid
+          arrays as part of its boot process. 
+
+          If you don't use raid and say Y, this autodetection can cause 
+          a several-second delay in the boot time due to various
+          synchronisation steps that are part of this step.
+
+          If unsure, say Y.
+
 config MD_LINEAR
         tristate "Linear (append) mode"
         depends on BLK_DEV_MD