From: Anthony Liguori <aliguori@amazon.com>
Date: Wed, 11 Dec 2013 00:14:20 +0000 (-0800)
Subject: Merge remote-tracking branch 'stefanha/net-next' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b9aad5d68d0fa636d1a1edbbeffa0d7a80370711;p=qemu.git

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>
---

b9aad5d68d0fa636d1a1edbbeffa0d7a80370711