diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2013-03-09 11:02:23 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-03-09 11:02:23 +0000 |
| commit | eb839909aa22069e04e1c910fcdf7feaa5581af6 (patch) | |
| tree | dbe8648a2a0d7568109ba143e51ed40185e6cdda /scripts | |
| parent | 62e1aeaee4d0450222a0ea43c713b59526e3e0fe (diff) | |
| parent | 8a7df84f9ff4342cae30f4e515e6ac82a0eb0bea (diff) | |
Merge branch 's390-for-upstream' of git://github.com/agraf/qemu
* 's390-for-upstream' of git://github.com/agraf/qemu:
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions