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

diff --combined Documentation/00-INDEX
index 73060819ed99c6889c716cf922e1997f37f4a0b0,73060819ed99c6889c716cf922e1997f37f4a0b0,1427969275a16b1c21a233ab92df80e041698d05..4382778001039c7fc6595f7659895a7301533ba8
--- 1/Documentation/00-INDEX
--- 2/Documentation/00-INDEX
--- 3/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@@@ -159,8 -159,8 -159,6 +159,6 @@@@ hayes-esp.tx
        - info on using the Hayes ESP serial driver.
   highuid.txt
        - notes on the change from 16 bit to 32 bit user/group IDs.
-- hpet.txt
--      - High Precision Event Timer Driver for Linux.
   timers/
        - info on the timer related topics
   hw_random.txt
@@@@ -251,6 -251,6 -249,8 +249,6 @@@@ mono.tx
        - how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
   moxa-smartio
        - file with info on installing/using Moxa multiport serial driver.
  -mtrr.txt
  -     - how to use PPro Memory Type Range Registers to increase performance.
   mutex-design.txt
        - info on the generic mutex subsystem.
   namespaces/