summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-18 10:36:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-18 10:36:02 -0700
commit6f7024285864290259d6b4c36f9e84a4b89ec3c4 (patch)
tree6d6c429ae933289a993030609e2c2bb3627fda4f /security
parentc1e3209623ccd92f2f391a31ecf3895daa0238f3 (diff)
parent6b1859dba01c7d512b72d77e3fd7da8354235189 (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
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions