summaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-31 07:55:14 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-31 07:55:14 -0500
commitc05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c (patch)
tree462696ac1f6dda50a8f49d5d5ac2a93f8a16adec /block/cfq-iosched.c
parente9dcfaff0105045d6bbacb7620ee13f1976ecf07 (diff)
parent910cd32e552ea09caa89cdbe328e468979b030dd (diff)
downloadlinux-0-day-c05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c.tar.gz
linux-0-day-c05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c.tar.xz
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 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions