diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:59:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 07:59:17 -0700 |
| commit | c3ed9ea4ab460080dea9449c709be9316c670c72 (patch) | |
| tree | 8330e32353e132b090472751161325baf4e27133 /fs/smbfs/file.c | |
| parent | 0fed2b5cb4c04336b26b0cbf6f9a8c07081f79a6 (diff) | |
| parent | f00e047efdf9d31c8a7dd7875b411f97cfa7d8e5 (diff) | |
| download | linux-c3ed9ea4ab460080dea9449c709be9316c670c72.tar.bz2 | |
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
Diffstat (limited to 'fs/smbfs/file.c')
0 files changed, 0 insertions, 0 deletions