tree 1218c32008412e57314f8f9db8d3b4912e2ecb25
parent 810ee58de26c9c1255d716b1db7344c4a1093fec
parent 1d4a7f1c4faf53eb9e822743ec8a70b3019a26d2
author Linus Torvalds <torvalds@linux-foundation.org> 1232992063 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1232992063 -0800

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