tree 8772c03b73159524183f08337b134503ddf8479e
parent 97fd9ed48ce2b807edc363bef3e817aeeb5cd5e6
parent 64f1607ffbbc772685733ea63e6f7f4183df1b16
author Thomas Gleixner <tglx@linutronix.de> 1250258340 +0200
committer 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>