From: Anthony Liguori Date: Mon, 10 Jun 2013 16:37:39 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/net' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97f31cbc71fc13b3091893313a555c3cf1ecb798;p=qemu.git 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 --- 97f31cbc71fc13b3091893313a555c3cf1ecb798