Merge remote-tracking branch 'linus/master' into x86/urgent

author H. Peter Anvin <[email protected]>

Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)

committer H. Peter Anvin <[email protected]>

Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
author H. Peter Anvin <[email protected]>
Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
committer H. Peter Anvin <[email protected]>
Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/tsc.c
Simple merge
author	H. Peter Anvin <[email protected]>
	Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
committer	H. Peter Anvin <[email protected]>
	Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	patch \|	diff1 \|	diff2 \|	blob \| history