Merge commit 'v3.0' into x86/vdso
H. Peter Anvin [Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)]
1  2 
arch/x86/Kconfig
drivers/char/hpet.c
include/linux/clocksource.h

Simple merge
Simple merge
Simple merge