Merge commit 'v3.0' into x86/vdso
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 4 Aug 2011 23:13:20 +0000 (16:13 -0700)
commit17b0436077d99211d8b26886235a36c5ec54ac57
tree8bcd9b4a0f8285f749814e95ae0365c611ba2392
parentaafade242ff24fac3aabf61c7861dfa44a3c2445
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
Merge commit 'v3.0' into x86/vdso
arch/x86/Kconfig
drivers/char/hpet.c
include/linux/clocksource.h