Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 00:27:08 +0000 (16:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Mar 2010 00:27:08 +0000 (16:27 -0800)
commit64d5aea30062ce9f3ce7c62be8ae65e776cbfee2
tree7020f4b8533d7fcf5eb24494453515ee672dd172
parent3836a03d978e68b0ae00d3589089343c998cd4ff
parentad6759fbf35d104dbf573cd6f4c6784ad6823f7e
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:
  timekeeping: Prevent oops when GENERIC_TIME=n