aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 11:05:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 11:05:22 -0800
commitf3c233d75ed0dd04e9eaf7cb43d79756fef1ef3a (patch)
tree940fa2fb846a0d6e9bbc3232ebb8295c958d89a7 /arch
parentMerge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentntp: Fixup adjtimex freq validation on 32-bit systems (diff)
downloadlinux-dev-f3c233d75ed0dd04e9eaf7cb43d79756fef1ef3a.tar.xz
linux-dev-f3c233d75ed0dd04e9eaf7cb43d79756fef1ef3a.zip
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull ntp fix from Ingo Molnar: "An adjtimex interface regression fix for 32-bit systems" [ A check that was added in a previous commit is really only a concern for 64bit systems, but was applied to both 32 and 64bit systems, which results in breaking 32bit systems. Thus the fix here is to make the check only apply to 64bit systems ] * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ntp: Fixup adjtimex freq validation on 32-bit systems
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions