diff options
author | 2011-02-01 15:22:48 -0600 | |
---|---|---|
committer | 2011-02-01 15:22:48 -0600 | |
commit | 9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4 (patch) | |
tree | 77c55ab45310cbeced2a05e1f85a109bf2efd481 /net/tap-linux.c | |
parent | Merge remote branch 'spice/usb.5' into staging (diff) | |
parent | spice: add chardev (v5) (diff) | |
download | qemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.tar.xz qemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.zip |
Merge remote branch 'spice/spice.v29.pull' into staging
Conflicts:
trace-events
Diffstat (limited to 'net/tap-linux.c')
0 files changed, 0 insertions, 0 deletions