Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Fri, 14 Aug 2009 13:59:00 +0000 (15:59 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 14 Aug 2009 13:59:30 +0000 (15:59 +0200)
commit4cd1993f0046fbc765dbf20af90966f5661e3789
tree8772c03b73159524183f08337b134503ddf8479e
parent97fd9ed48ce2b807edc363bef3e817aeeb5cd5e6
parent64f1607ffbbc772685733ea63e6f7f4183df1b16
Merge branch 'linus' into timers/core

Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/linux/hrtimer.h
kernel/hrtimer.c
kernel/timer.c