]> git.baikalelectronics.ru Git - kernel.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)
commita425da26184b368015454e07351f0e6b00708acb
treecd943e4e7641c53797fc2918c8230a7f959a071b
parent362ad8e23a6a0979a7cb56d6d7183377af7540f3
parent6c22a5a45c7775b8a006d48f5bf04037a88cd967
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/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()