tree 80e7ceee6758bd7ea76cf5505aa2f41d3376b0ba
parent 4416662ece4e88aca687b28d7c059336b47478ba
parent 621a0d5207c18012cb39932f2d9830a11a6cb03d
author Linus Torvalds <torvalds@linux-foundation.org> 1226520015 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226520015 -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:
  hrtimer: clean up unused callback modes