Merge branch 'timers/posixtimers' into timers/tracing
Thomas Gleixner [Sat, 29 Aug 2009 08:34:18 +0000 (10:34 +0200)]
Merge reason: timer tracepoint patches depend on both branches

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

1  2 
arch/powerpc/kernel/time.c
kernel/fork.c
kernel/posix-cpu-timers.c

Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge