diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 16:24:49 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 16:24:49 (GMT) |
| commit | 9d2cd7048b1ec21309e2d1a32bf50732eb5d5de8 (patch) | |
| tree | 0fd13d51002dc3d0991cb5bdd6e026970171d457 /net/caif | |
| parent | 7e28b2712e5ebd8d73d25561585bc2ae77da5c30 (diff) | |
| parent | 7bd36014460f793c19e7d6c94dab67b0afcfcb7f (diff) | |
| download | linux-fsl-qoriq-9d2cd7048b1ec21309e2d1a32bf50732eb5d5de8.tar.xz | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar:
"An NTP related lockup fix"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timekeeping: Fix HRTICK related deadlock from ntp lock changes
Diffstat (limited to 'net/caif')
0 files changed, 0 insertions, 0 deletions