tree 6bb0c0490d66d32eca43e73abb28d8b3ab0e7b91
parent ff830b8e5f999d1ccbd0282a666520f0b557daa4
parent 3f0a525ebf4b8ef041a332bbe4a73aee94bb064b
author Linus Torvalds <torvalds@linux-foundation.org> 1253724375 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253724375 -0700

Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/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