From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jan 2009 17:47:43 +0000 (-0800)
Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.29-rc3~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e70c7f7a9d4a3d2cc78b40e1d7768d99cd79899;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimers: fix inconsistent lock state on resume in hres_timers_resume
  time-sched.c: tick_nohz_update_jiffies should be static
  locking, hpet: annotate false positive warning
  kernel/fork.c: unused variable 'ret'
  itimers: remove the per-cpu-ish-ness
---

1e70c7f7a9d4a3d2cc78b40e1d7768d99cd79899