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

2008-10-13 14:18:42 +02:00
parent c1a2f4b108 accba5f396 f26ed116c0
commit c00193f9f0
20 changed files with 1004 additions and 374 deletions
--- 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