commit 9343af084c7e8911897b0883042ee690cee3aaef
author David S. Miller <davem@davemloft.net> Tue Apr 13 00:28:45 2010 -0700
committer David S. Miller <davem@davemloft.net> Tue Apr 13 00:28:45 2010 -0700
tree 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3
parent e182c77cc291456eed127b1472952ddb59a81a9d
parent 0d0fb0f9c5fddef4a10242fe3337f00f528a3099

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

Conflicts:
	lib/Kconfig.debug

lib/Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6c2be60..935248b 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -356,7 +356,7 @@
 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