]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7da9c1 c87826a)
Merge remote-tracking branch 'stefanha/net' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Jun 2013 16:37:39 +0000 (11:37 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 10 Jun 2013 16:37:39 +0000 (11:37 -0500)
commit97f31cbc71fc13b3091893313a555c3cf1ecb798
tree17ff5cdb268caa29549cffce0854160efdb6845atree
parentf7da9c17c114417911ac2008d0401084a5030391commit | diff
parentc87826a878be05208c3906eb9d5e1f37cff5e98ecommit | diff
Merge remote-tracking branch 'stefanha/net' into staging

# By Jason Wang (1) and Stefan Hajnoczi (1)
# Via Stefan Hajnoczi
* stefanha/net:
  tap: fix NULL dereference when passing invalid parameters to tap
  vmxnet3: fix NICState cleanup

Message-id: 1370613288-14933-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Qemu copy for testing