| commit | b347635556272f509263dc0c3fdda6fa9f16645c | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 15 Oct 2009 17:23:26 +0000 (15 18:23 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 15 Oct 2009 17:23:29 +0000 (15 18:23 +0100) | ||
| tree | 2902ebc9c8342e88400810db23b93af405a802c0 | treesnapshot (tar.gz zip) |
| parent | 854130ab85280bee21d1ad5292a3eee2c7967e04 | commitdiff |
| parent | 5869c4d515128cd3a938a7346a8037abcc232220 | commitdiff |
Merge commit '5869c4d515128cd3a938a7346a8037abcc232220' into upstream-merge
* commit '5869c4d515128cd3a938a7346a8037abcc232220':
net: add -net nic,netdev= option
net: maintain a list of vlan-less clients
net: handle -netdevice options
net: add -netdev option
net: add QemuOptsList arg to net_client_parse()
net: allow clients not associated with a vlan
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '5869c4d515128cd3a938a7346a8037abcc232220':
net: add -net nic,netdev= option
net: maintain a list of vlan-less clients
net: handle -netdevice options
net: add -netdev option
net: add QemuOptsList arg to net_client_parse()
net: allow clients not associated with a vlan
Signed-off-by: Mark McLoughlin <markmc@redhat.com>