From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 16:46:15 +0000 (-0700)
Subject: Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.32-rc1~168
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31bbb9b58d1e8ebcf2b28c95c2250a9f8e31e397;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'timers-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* '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
---

31bbb9b58d1e8ebcf2b28c95c2250a9f8e31e397
diff --cc kernel/fork.c
index 8f45b0e,14cf79f..51ad0b0
--- a/kernel/fork.c
+++ b/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>