From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Oct 2010 16:50:03 +0000 (-0700)
Subject: Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.36~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c9192798b9318a4b3f96c41ae27805cc8b46b7ee;p=karo-tx-linux.git

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()
---

c9192798b9318a4b3f96c41ae27805cc8b46b7ee