From: Anthony Liguori Date: Fri, 24 May 2013 18:47:33 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/net' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4a542df0910dff2caf17d6bb76bbf3704197db42;p=qmiga%2Fqemu.git Merge remote-tracking branch 'stefanha/net' into staging # By Alasdair McLeay (1) and Stefan Hajnoczi (1) # Via Stefan Hajnoczi * stefanha/net: rtl8139: flush queued packets when RxBufPtr is written net: support for bridged networking on Mac OS X Message-id: 1369406295-20411-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori --- 4a542df0910dff2caf17d6bb76bbf3704197db42