Merge branch 'linus' into timers/core
Thomas Gleixner [Mon, 10 May 2010 09:59:37 +0000 (11:59 +0200)]
Reason: Further posix_cpu_timer patches depend on mainline changes

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

1  2 
Documentation/feature-removal-schedule.txt
ipc/mqueue.c
kernel/posix-cpu-timers.c
kernel/time.c
kernel/time/timekeeping.c
kernel/timer.c

diff --cc ipc/mqueue.c
Simple merge
Simple merge
diff --cc kernel/time.c
Simple merge
Simple merge
diff --cc kernel/timer.c
Simple merge