tree 17ff5cdb268caa29549cffce0854160efdb6845a
parent f7da9c17c114417911ac2008d0401084a5030391
parent c87826a878be05208c3906eb9d5e1f37cff5e98e
author Anthony Liguori <aliguori@us.ibm.com> 1370882259 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1370882259 -0500

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 <aliguori@us.ibm.com>