Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 00:10:57 +0000 (17:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 00:10:57 +0000 (17:10 -0700)
commit5bfec46baa3a752393433b8d89d3b2c70820f61d
tree62bcf1a1e43de6cb1721feb1861bdf7ee70007ff
parent6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1
parentfdb19a6cb48407c59a2007063f4005c9384603c3
Merge branch 'timers-fixes-for-linus' of git://git./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:
  cs5535-clockevt: Free timer in IRQ setup error path