| commit | c3ed9ea4ab460080dea9449c709be9316c670c72 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 24 07:59:17 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 24 07:59:17 2010 -0700 |
| tree | 8330e32353e132b090472751161325baf4e27133 | |
| parent | 0fed2b5cb4c04336b26b0cbf6f9a8c07081f79a6 [diff] | |
| parent | f00e047efdf9d31c8a7dd7875b411f97cfa7d8e5 [diff] |
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: timers: Fix slack calculation for expired timers timekeeping: Fix timezone update