diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 20:39:17 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-10 20:39:17 -0500 |
| commit | fa3889162ff724d09eb6b6bd06ba54769100a77f (patch) | |
| tree | 25b0ed35ec1016a1d69dec4520e7e3611f361c07 /MAINTAINERS | |
| parent | 6e72a00f909dcd093fbdd1faa2b3c8caa1697a6c (diff) | |
| parent | a4960ef34829c355fdf25b8ee6b869c92393e366 (diff) | |
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (75 commits)
tcg: Don't make exitreq flag a local temporary
Makefile: Add subdir dependency on config-devices-all.mak
make_device_config.sh: Emit dependency file to directory where included
Revert "make_device_config.sh: Fix target path in generated dependency file"
s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
s390/css: Fix subchannel detection
Allow virtio-net features for legacy s390 virtio bus
s390: virtio-ccw maintainer
s390: simplify kvm cpu init
pseries: Add compatible property to root of device tree
target-ppc: Move CPU aliases out of translate_init.c
target-ppc: Report CPU aliases for QMP
target-ppc: List alias names alongside CPU models
target-ppc: Make host CPU a subclass of the host's CPU model
PPC: xnu kernel expects FLUSH to be cleared on STOP
PPC: Fix dma interrupt
target-ppc: Fix PPC_DUMP_SPR_ACCESS build
target-ppc: Synchronize FPU state with KVM
target-ppc: Add mechanism for synchronizing SPRs with KVM
Save memory allocation in the elf loader
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2439614ad2..0ca7e1da8c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -454,6 +454,14 @@ M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/s390-*.c +S390 Virtio-ccw +M: Cornelia Huck <cornelia.huck@de.ibm.com> +M: Alexander Graf <agraf@suse.de> +S: Supported +F: hw/s390x/s390-virtio-ccw.c +F: hw/s390x/css.[hc] +T: git git://github.com/cohuck/qemu virtio-ccw-upstr + UniCore32 Machines ------------- PKUnity-3 SoC initramfs-with-busybox @@ -565,6 +573,12 @@ M: Stefan Hajnoczi <stefanha@redhat.com> S: Supported F: hw/virtio-blk* +virtio-ccw +M: Cornelia Huck <cornelia.huck@de.ibm.com> +S: Supported +F: hw/s390x/virtio-ccw.[hc] +T: git git://github.com/cohuck/qemu virtio-ccw-upstr + virtio-serial M: Amit Shah <amit.shah@redhat.com> S: Supported |