Merge branch 'dma-debug/2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Ingo Molnar <mingo@elte.hu>

Sun, 7 Jun 2009 09:36:02 +0000 (11:36 +0200)

committer Ingo Molnar <mingo@elte.hu>

Sun, 7 Jun 2009 09:36:02 +0000 (11:36 +0200)
author Ingo Molnar <mingo@elte.hu>
Sun, 7 Jun 2009 09:36:02 +0000 (11:36 +0200)
committer Ingo Molnar <mingo@elte.hu>
Sun, 7 Jun 2009 09:36:02 +0000 (11:36 +0200)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc lib/dma-debug.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Sun, 7 Jun 2009 09:36:02 +0000 (11:36 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 7 Jun 2009 09:36:02 +0000 (11:36 +0200)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dma-debug.c	patch \|	diff1 \|	diff2 \|	blob \| history