summaryrefslogtreecommitdiffstats
path: root/drivers/s390/kvm/virtio_ccw.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-11-13 00:21:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-11-13 00:21:52 +0100
commit74b60ef779f47629b22200f6568a7cda1cd12c83 (patch)
treeb6c67e0cf29c9fb590059ffcf8a02845c6bc0aab /drivers/s390/kvm/virtio_ccw.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)
parentMerge tag 'v3.18-rc4' into for_next (diff)
downloadlinux-74b60ef779f47629b22200f6568a7cda1cd12c83.tar.xz
linux-74b60ef779f47629b22200f6568a7cda1cd12c83.zip
Merge tag 'xtensa-20141109' of git://github.com/czankel/xtensa-linux
Pull Xtensa fixes from Chris Zankel: - fix umount syscall - fix ISS and xtfpga Kconfig dependencies so that more randconfigs are buildable - add seccomp, getrandom, and memfd_create syscalls - add defconfigs for KC705 and SMP LX200 - implement pgprot_noncached * tag 'xtensa-20141109' of git://github.com/czankel/xtensa-linux: xtensa: xtfpga: add lx200 SMP DTS and defconfig xtensa: xtfpga: add generic KC705 board config xtensa: re-wire umount syscall to sys_oldumount xtensa: xtfpga: only select ethoc when ethernet is available xtensa: add seccomp, getrandom, and memfd_create syscalls xtensa: ISS: add BLOCK dependency to BLK_DEV_SIMDISK xtensa: implement pgprot_noncached xtensa/uapi: Add definition of TIOC[SG]RS485
Diffstat (limited to 'drivers/s390/kvm/virtio_ccw.c')
0 files changed, 0 insertions, 0 deletions