Commit 60b6381f authored by Peter Maydell's avatar Peter Maydell

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141021' into staging

add missing s390x files to MAINTAINERS

# gpg: Signature made Tue 21 Oct 2014 11:57:12 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <>"
# gpg:                 aka "Cornelia Huck <>"

* remotes/cohuck/tags/s390x-20141021:
  s390x: sweep up unmaintained files
Signed-off-by: default avatarPeter Maydell <>
parents 8f4699d8 4277af19
......@@ -198,7 +198,9 @@ M: Cornelia Huck <>
M: Alexander Graf <>
S: Maintained
F: target-s390x/kvm.c
F: hw/intc/s390_flic.[hc]
F: hw/intc/s390_flic.c
F: hw/intc/s390_flic_kvm.c
F: include/hw/s390x/s390_flic.h
M: Marcelo Tosatti <>
......@@ -521,6 +523,8 @@ F: hw/s390x/s390-virtio-ccw.c
F: hw/s390x/css.[hc]
F: hw/s390x/sclp*.[hc]
F: hw/s390x/ipl*.[hc]
F: include/hw/s390x/
F: pc-bios/s390-ccw/
T: git git:// virtio-ccw-upstr
UniCore32 Machines
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment