summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-31 14:55:14 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-31 14:55:14 +0200
commitc05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c (patch)
tree462696ac1f6dda50a8f49d5d5ac2a93f8a16adec /fs/btrfs/ioctl.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff)
parentparisc: Fix and enable seccomp filter support (diff)
downloadlinux-c05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c.tar.xz
linux-c05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c.zip
Merge branch 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller: "Fix seccomp filter support and SIGSYS signals on compat kernel. Both patches are tagged for v4.5 stable kernel" * 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Fix and enable seccomp filter support parisc: Fix SIGSYS signals in compat case
Diffstat (limited to 'fs/btrfs/ioctl.c')
0 files changed, 0 insertions, 0 deletions