Merge branch 'x86/vdso'
commitcf539ded1ffc47b7768dc983cc5fc8a202012363
authorIngo Molnar <mingo@elte.hu>
Fri, 22 Jul 2011 08:18:24 +0000 (22 10:18 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 22 Jul 2011 08:18:24 +0000 (22 10:18 +0200)
tree10b0d670bcb221d7611521849b03ec382fc9770b
parentf0e2461c83424f182d8069e1102d7651b8630ca3
parentaafade242ff24fac3aabf61c7861dfa44a3c2445
Merge branch 'x86/vdso'
arch/ia64/Kconfig
arch/x86/Kconfig
arch/x86/include/asm/cpufeature.h
arch/x86/kernel/Makefile
arch/x86/kernel/hpet.c
arch/x86/kernel/tsc.c
drivers/char/hpet.c
include/linux/clocksource.h