Merge commit 'v3.0' into x86/vdso

author H. Peter Anvin <hpa@linux.intel.com>

Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)

committer H. Peter Anvin <hpa@linux.intel.com>

Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
author H. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
committer H. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc drivers/char/hpet.c
Simple merge
diff --cc include/linux/clocksource.h
Simple merge
author	H. Peter Anvin <hpa@linux.intel.com>
	Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/hpet.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/clocksource.h	patch \|	diff1 \|	diff2 \|	blob \| history