tree 5735cb47e70853d057a9881dd0ce44b83e88fa63
parent 6a867a395558a7f882d041783e4cdea6744ca2bf
parent b57f95a38233a2e73b679bea4a5453a1cc2a1cc9
author Thomas Gleixner <tglx@linutronix.de> 1273485577 +0200
committer Thomas Gleixner <tglx@linutronix.de> 1273494042 +0200

Merge branch 'linus' into timers/core

Reason: Further posix_cpu_timer patches depend on mainline changes

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