tree 62bcf1a1e43de6cb1721feb1861bdf7ee70007ff
parent 6fa0fddd5f60064f22f8d389f5aeb7dd1646dfe1
parent fdb19a6cb48407c59a2007063f4005c9384603c3
author Linus Torvalds <torvalds@linux-foundation.org> 1274314257 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274314257 -0700

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:
  cs5535-clockevt: Free timer in IRQ setup error path