Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Mon, 10 May 2010 09:59:37 +0000 (11:59 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 10 May 2010 12:20:42 +0000 (14:20 +0200)
commitdbb6be6d5e974c42bbecd183effaa0df69e1dd8b
tree5735cb47e70853d057a9881dd0ce44b83e88fa63
parent6a867a395558a7f882d041783e4cdea6744ca2bf
parentb57f95a38233a2e73b679bea4a5453a1cc2a1cc9
Merge branch 'linus' into timers/core

Reason: Further posix_cpu_timer patches depend on mainline changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Documentation/feature-removal-schedule.txt
ipc/mqueue.c
kernel/posix-cpu-timers.c
kernel/time.c
kernel/time/timekeeping.c
kernel/timer.c