Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	lib/Kconfig.debug
This commit is contained in:
David S. Miller
2010-04-13 00:28:45 -07:00
4482 changed files with 22517 additions and 3302 deletions

View File

@@ -356,7 +356,7 @@ config SLUB_STATS
config DEBUG_KMEMLEAK
bool "Kernel memory leak detector"
depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
(X86 || ARM || PPC || S390 || SPARC64 || SUPERH)
(X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE)
select DEBUG_FS if SYSFS
select STACKTRACE if STACKTRACE_SUPPORT