diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-24 13:47:33 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-24 13:47:33 -0500 |
| commit | 4a542df0910dff2caf17d6bb76bbf3704197db42 (patch) | |
| tree | 0e59ee63f12613fdfaebc9f6fac5b3314607f046 /hw/block/pflash_cfi01.c | |
| parent | 4c5dad040bce8f8c9924dc72cfac9380e4ffdc26 (diff) | |
| parent | 00b7ade807b5ce6779ddd86ce29c5521ec5c529a (diff) | |
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 <aliguori@us.ibm.com>
Diffstat (limited to 'hw/block/pflash_cfi01.c')
0 files changed, 0 insertions, 0 deletions