summaryrefslogtreecommitdiffstats
path: root/fs/splice.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-12-16 02:49:10 +0100
committerJames Morris <james.l.morris@oracle.com>2014-12-16 02:49:10 +0100
commitd0bffab0439fb7edaee09677b636eef5991e8b80 (patch)
tree4437686bf7e9bea8f6444f23850f21a7b9f360a7 /fs/splice.c
parentMerge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (diff)
parentima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met (diff)
downloadlinux-d0bffab0439fb7edaee09677b636eef5991e8b80.tar.xz
linux-d0bffab0439fb7edaee09677b636eef5991e8b80.zip
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions