Merge commit 'v2.6.26' into x86/core

author Ingo Molnar <mingo@elte.hu>

Mon, 14 Jul 2008 09:37:46 +0000 (11:37 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 14 Jul 2008 09:37:46 +0000 (11:37 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 09:37:46 +0000 (11:37 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 09:37:46 +0000 (11:37 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc include/asm-x86/desc.h
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 14 Jul 2008 09:37:46 +0000 (11:37 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 14 Jul 2008 09:37:46 +0000 (11:37 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-x86/desc.h	patch \|	diff1 \|	diff2 \|	blob \| history