]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 16:50:03 +0000 (09:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Oct 2010 16:50:03 +0000 (09:50 -0700)
commitc9192798b9318a4b3f96c41ae27805cc8b46b7ee
treecd943e4e7641c53797fc2918c8230a7f959a071b
parent1bbee7d616d5fdffa6c1c86075dbffe2b3e236ea
parentf13d4f979c518119bba5439dd2364d76d31dcd3f
Merge branch 'timers-for-linus-urgent' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimer: Preserve timer state in remove_hrtimer()