Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Wed, 23 Sep 2009 16:46:15 +0000 (09:46 -0700)]
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  itimers: Add tracepoints for itimer
  hrtimer: Add tracepoint for hrtimers
  timers: Add tracepoints for timer_list timers
  cputime: Optimize jiffies_to_cputime(1)
  itimers: Simplify arm_timer() code a bit
  itimers: Fix periodic tics precision
  itimers: Merge ITIMER_VIRT and ITIMER_PROF

Trivial header file include conflicts in kernel/fork.c

1  2 
arch/powerpc/kernel/time.c
include/linux/sched.h
kernel/fork.c
kernel/hrtimer.c
kernel/sched.c
kernel/timer.c

Simple merge
Simple merge
diff --cc kernel/fork.c
@@@ -62,7 -61,8 +62,8 @@@
  #include <linux/blkdev.h>
  #include <linux/fs_struct.h>
  #include <linux/magic.h>
 -#include <linux/perf_counter.h>
 +#include <linux/perf_event.h>
+ #include <linux/posix-timers.h>
  
  #include <asm/pgtable.h>
  #include <asm/pgalloc.h>
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/timer.c
Simple merge