| commit | 6f7024285864290259d6b4c36f9e84a4b89ec3c4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 18 10:36:02 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 18 10:36:02 2012 -0700 |
| tree | 6d6c429ae933289a993030609e2c2bb3627fda4f | |
| parent | c1e3209623ccd92f2f391a31ecf3895daa0238f3 [diff] | |
| parent | 6b1859dba01c7d512b72d77e3fd7da8354235189 [diff] |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip One more time/ntp fix pulled from Ingo Molnar. * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ntp: Fix STA_INS/DEL clearing bug