Thomas Gleixner <tglx@linutronix.de> 1250258370 +0200

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>
YٓS�<x