Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/Makefile
	drivers/usb/input/gtco.c

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 4448f91b865c..79afd00bbe5f 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -261,7 +261,7 @@ config LOCKDEP
         bool
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
         select STACKTRACE
-        select FRAME_POINTER if !X86
+        select FRAME_POINTER if !X86 && !MIPS
         select KALLSYMS
         select KALLSYMS_ALL
 
@@ -411,8 +411,6 @@ config LKDTM
 config FAULT_INJECTION
         bool "Fault-injection framework"
         depends on DEBUG_KERNEL
-        depends on STACKTRACE
-        select FRAME_POINTER
         help
           Provide fault-injection framework.
           For more details, see Documentation/fault-injection/.
@@ -440,3 +438,11 @@ config FAULT_INJECTION_DEBUG_FS
         depends on FAULT_INJECTION && SYSFS && DEBUG_FS
         help
           Enable configuration of fault-injection capabilities via debugfs.
+
+config FAULT_INJECTION_STACKTRACE_FILTER
+        bool "stacktrace filter for fault-injection capabilities"
+        depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT
+        select STACKTRACE
+        select FRAME_POINTER
+        help
+          Provide stacktrace filter for fault-injection capabilities