diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-10 16:14:20 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-10 16:14:20 -0800 |
| commit | b9aad5d68d0fa636d1a1edbbeffa0d7a80370711 (patch) | |
| tree | b21dd4d8fecabe85167ce2b889aa1a32d44a47a5 /hw/pci/pci-stub.c | |
| parent | 1ead3ed55584a62a12d840a71d3aab71f12ec42e (diff) | |
| parent | 02d38fcb2caa4454cf4ed728d5908c3cc9ba47be (diff) | |
Merge remote-tracking branch 'stefanha/net-next' into staging
# By Vincenzo Maffione (2) and others
# Via Stefan Hajnoczi
* stefanha/net-next:
net: Update netdev peer on link change
virtio-net: don't update mac_table in error state
MAINTAINERS: Add netmap maintainers
net: Adding netmap network backend
Message-id: 1386594692-21278-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'hw/pci/pci-stub.c')
0 files changed, 0 insertions, 0 deletions