Merge branch 'linus' into timers/core
Thomas Gleixner [Fri, 14 Aug 2009 13:59:00 +0000 (15:59 +0200)]
Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.

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

1  2 
include/linux/hrtimer.h
kernel/hrtimer.c
kernel/timer.c

Simple merge
Simple merge
diff --cc kernel/timer.c
Simple merge