Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4