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

[linux-2.6-omap-h63xx.git] / Documentation / 00-INDEX

diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 73060819ed99c6889c716cf922e1997f37f4a0b0..4382778001039c7fc6595f7659895a7301533ba8 100644 (file)
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -159,8 +159,6 @@ hayes-esp.txt
        - 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