| commit | ca31ed855e899e3d15d2f4a4ba15d4f1377acd89 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Fri, 27 Nov 2015 18:06:34 +0000 (27 19:06 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Fri, 27 Nov 2015 18:06:34 +0000 (27 19:06 +0100) | ||
| tree | c6374e05a1989df24ebc1e16a6b418f3e06ad02f | treesnapshot (tar.gz zip) |
| parent | f5220ce210477434a959c8a4f3692fb0dcf204ec | commitdiff |
| parent | 714487515dbe0c65d5904251e796cd3a5b3579fb | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
hw/net/eepro100.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
hw/net/eepro100.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
| hw/net/eepro100.c | diff1 | diff2 | blobhistory |
| net/tap-win32.c | diff1 | diff2 | blobhistory |