From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 13 Oct 2008 12:18:42 +0000 (+0200)
Subject: Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4
X-Git-Tag: v2.6.28-rc1~611^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c00193f9f09f9b852249a66391985f585d066084;hp=-c;p=linux-2.6-omap-h63xx.git

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

c00193f9f09f9b852249a66391985f585d066084
diff --combined Documentation/00-INDEX
index 73060819ed9,73060819ed9,1427969275a..43827780010
--- a/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/