Merge branch 'linus'

Conflicts:

	drivers/scsi/ipr.c

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 1429f3a2629e..5d6312e33490 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -37,6 +37,18 @@ config DEBUG_DRIVER
 
           If you are unsure about this, say N here.
 
+config DEBUG_DEVRES
+        bool "Managed device resources verbose debug messages"
+        depends on DEBUG_KERNEL
+        help
+          This option enables kernel parameter devres.log. If set to
+          non-zero, devres debug messages are printed. Select this if
+          you are having a problem with devres or want to debug
+          resource management for a managed device. devres.log can be
+          switched on and off from sysfs node.
+
+          If you are unsure about this, Say N here.
+
 config SYS_HYPERVISOR
         bool
         default n