diff --git a/[refs] b/[refs]
index 67863b9dc6a5..a75008ba5775 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4237e5fd3e07da268029cd4862cf551d9a74e33f
+refs/heads/master: 7934779a69f1184f29d786b89e77dd14519bd226
diff --git a/trunk/drivers/base/Kconfig b/trunk/drivers/base/Kconfig
index 8021e19fa1ea..fd52c48ee762 100644
--- a/trunk/drivers/base/Kconfig
+++ b/trunk/drivers/base/Kconfig
@@ -3,10 +3,18 @@ menu "Generic Driver Options"
 config UEVENT_HELPER_PATH
 	string "path to uevent helper"
 	depends on HOTPLUG
-	default "/sbin/hotplug"
+	default ""
 	help
 	  Path to uevent helper program forked by the kernel for
 	  every uevent.
+	  Before the switch to the netlink-based uevent source, this was
+	  used to hook hotplug scripts into kernel device events. It
+	  usually pointed to a shell script at /sbin/hotplug.
+	  This should not be used today, because usual systems create
+	  many events at bootup or device discovery in a very short time
+	  frame. One forked process per event can create so many processes
+	  that it creates a high system load, or on smaller systems
+	  it is known to create out-of-memory situations during bootup.
 
 config DEVTMPFS
 	bool "Maintain a devtmpfs filesystem to mount at /dev"