Merge branch 'linux-2.6' into for-2.6.24

This commit is contained in:
Paul Mackerras
2007-10-03 15:33:17 +10:00
170 changed files with 2331 additions and 1607 deletions

View File

@@ -284,7 +284,7 @@ config LOCKDEP
select KALLSYMS_ALL
config LOCK_STAT
bool "Lock usage statisitics"
bool "Lock usage statistics"
depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
select LOCKDEP
select DEBUG_SPINLOCK