summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-15 08:07:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-15 08:07:35 -0700
commit5f95063c686a86e7214988e04f08b9c0003cf83f (patch)
tree43b4c4761f8a88a2efd9224a9ea0310c67a07624 /fs/lockd
parent272911b889f47aa5bc3e004804fc2382f0ac6ce6 (diff)
parent9a7a076e8e4ffcfec05e3cafe4c4e31d41ddbaa0 (diff)
downloadlinux-5f95063c686a86e7214988e04f08b9c0003cf83f.tar.bz2
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner: "Just the missing compat entry for the new pread/writev2" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Use compat version for preadv2 and pwritev2
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions