| commit | 64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 12 16:27:08 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 12 16:27:08 2010 -0800 |
| tree | 7020f4b8533d7fcf5eb24494453515ee672dd172 | |
| parent | 3836a03d978e68b0ae00d3589089343c998cd4ff [diff] | |
| parent | ad6759fbf35d104dbf573cd6f4c6784ad6823f7e [diff] |
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: timekeeping: Prevent oops when GENERIC_TIME=n