aboutsummaryrefslogtreecommitdiff
path: root/target-alpha
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-06-25 14:03:55 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-06-25 14:03:55 +0100
commit0a4a0312bf8b029cbd32a97db2cad669cf65ac49 (patch)
treee5e6eafe789e7b6226a09ca318c1d7df1f3fdca7 /target-alpha
parent58e8b33518fd2bb6dce0ba7b6347c3df85aea3c6 (diff)
parent1e81aba5ac0b908ab859bf8ddf43ece33732d49c (diff)
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Wed Jun 24 16:37:23 2015 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" * remotes/stefanha/tags/net-pull-request: net: simplify net_client_init1() net: drop if expression that is always true net: raise an error if -net type is invalid net: replace net_client_init1() netdev whitelist with blacklist net: add missing "netmap" to host_net_devices[] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-alpha')
0 files changed, 0 insertions, 0 deletions