Merge branch 'timers/posixtimers' into timers/tracing
authorThomas Gleixner <tglx@linutronix.de>
Sat, 29 Aug 2009 08:34:18 +0000 (10:34 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 29 Aug 2009 08:34:29 +0000 (10:34 +0200)
commitf71bb0ac5e85410601b0db29d7b1635345ea61a4
tree7c3ef70ef008db87d8b71e5de0632766ecd64d2f
parent7285dd7fd375763bfb8ab1ac9cf3f1206f503c16
parenta42548a18866e87092db93b771e6c5b060d78401
Merge branch 'timers/posixtimers' into timers/tracing

Merge reason: timer tracepoint patches depend on both branches

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/powerpc/kernel/time.c
kernel/fork.c
kernel/posix-cpu-timers.c