summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-26 22:50:23 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-26 22:50:23 +0200
commit68e370289c29e3beac99d59c6d840d470af9dfcf (patch)
treef37cd93ef5033687402a08ec29760b8cc65f240a /fs/btrfs/volumes.c
parentDocumentation: this_cpu_ops.txt: Update description of this_cpu_ops (diff)
parents390/sclp: remove unnecessary XTABS flag (diff)
downloadlinux-68e370289c29e3beac99d59c6d840d470af9dfcf.tar.xz
linux-68e370289c29e3beac99d59c6d840d470af9dfcf.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky: - wire up the system calls seccomp, getrandom and memfd_create - use static system information as input to add_device_randomness - .. and three bug fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/sclp: remove unnecessary XTABS flag s390/3215: fix tty output containing tabs s390: wire up memfd_create syscall s390: add system information as device randomness s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL s390: wire up seccomp and getrandom syscalls
Diffstat (limited to 'fs/btrfs/volumes.c')
0 files changed, 0 insertions, 0 deletions