Merge branch 'linus' into x86/doc

author Ingo Molnar <[email protected]>

Thu, 21 Aug 2008 11:28:24 +0000 (13:28 +0200)

committer Ingo Molnar <[email protected]>

Thu, 21 Aug 2008 11:28:24 +0000 (13:28 +0200)
author Ingo Molnar <[email protected]>
Thu, 21 Aug 2008 11:28:24 +0000 (13:28 +0200)
committer Ingo Molnar <[email protected]>
Thu, 21 Aug 2008 11:28:24 +0000 (13:28 +0200)
diff --cc Documentation/00-INDEX
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
author	Ingo Molnar <[email protected]>
	Thu, 21 Aug 2008 11:28:24 +0000 (13:28 +0200)
committer	Ingo Molnar <[email protected]>
	Thu, 21 Aug 2008 11:28:24 +0000 (13:28 +0200)
		1	2
Documentation/00-INDEX	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history