Merge branch 'timers/posixtimers' into timers/tracing
authorThomas Gleixner <tglx@linutronix.de>
Sat, 29 Aug 2009 08:34:18 +0000 (10:34 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 29 Aug 2009 08:34:29 +0000 (10:34 +0200)
Merge reason: timer tracepoint patches depend on both branches

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Trivial merge