| commit | f0adc82064a5c28b34bdbc18e2d178c32094770b | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 6 Feb 2011 20:05:15 +0000 (6 12:05 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 6 Feb 2011 20:05:15 +0000 (6 12:05 -0800) | ||
| tree | 42c051d53c978c722687a2dc341f2b54db271417 | treesnapshot (tar.gz zip) |
| parent | 43a723286f3cae795418c62bc41c3cce73791a81 | commitdiff |
| parent | 55835eb62fad1253c9e657a667549945e4be9759 | commitdiff |
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:
lockdep, timer: Fix del_timer_sync() annotation
RTC: Prevents a division by zero in kernel code.
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep, timer: Fix del_timer_sync() annotation
RTC: Prevents a division by zero in kernel code.