Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86...

author Thomas Gleixner <[email protected]>

Tue, 22 Feb 2011 17:24:26 +0000 (18:24 +0100)

committer Thomas Gleixner <[email protected]>

Tue, 22 Feb 2011 17:41:48 +0000 (18:41 +0100)
author Thomas Gleixner <[email protected]>
Tue, 22 Feb 2011 17:24:26 +0000 (18:24 +0100)
committer Thomas Gleixner <[email protected]>
Tue, 22 Feb 2011 17:41:48 +0000 (18:41 +0100)
diff --cc arch/x86/kernel/apb_timer.c
Simple merge
diff --cc arch/x86/kernel/setup.c
Simple merge
diff --cc arch/x86/platform/mrst/mrst.c
Simple merge
author	Thomas Gleixner <[email protected]>
	Tue, 22 Feb 2011 17:24:26 +0000 (18:24 +0100)
committer	Thomas Gleixner <[email protected]>
	Tue, 22 Feb 2011 17:41:48 +0000 (18:41 +0100)
		1	2
arch/x86/kernel/apb_timer.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/mrst/mrst.c	patch \|	diff1 \|	diff2 \|	blob \| history