summaryrefslogtreecommitdiffstats
path: root/qapi
diff options
context:
space:
mode:
authorPeter Maydell2014-06-29 13:45:54 +0200
committerPeter Maydell2014-06-29 13:45:54 +0200
commit76fbbec9315f8712d921411fbb4dad1fbcf1b151 (patch)
tree30b76243b8a5c98b64840c40e65597f94c08bfa0 /qapi
parentMerge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' int... (diff)
parenthw/net/eepro100: Implement read-only bits in MDI registers (diff)
downloadqemu-76fbbec9315f8712d921411fbb4dad1fbcf1b151.tar.gz
qemu-76fbbec9315f8712d921411fbb4dad1fbcf1b151.tar.xz
qemu-76fbbec9315f8712d921411fbb4dad1fbcf1b151.zip
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
Net patches # gpg: Signature made Fri 27 Jun 2014 14:10:57 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: hw/net/eepro100: Implement read-only bits in MDI registers net: move queue number into NICPeers net: L2TPv3 transport qemu-bridge-helper: Fix fd leak in main() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
0 files changed, 0 insertions, 0 deletions