diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-06 14:35:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-06 14:35:52 +0000 |
| commit | cebbae86b4f7ee3d3dd9df906b97d269e70d9cc7 (patch) | |
| tree | 1e85e8bb960a04a33376f23db72a34e2cc26837b /hw/timer | |
| parent | b93acb92cad1f38737e481fc85cb5c41a559d855 (diff) | |
| parent | 2c4681f512822b4aa35371683e164d4818f21dce (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Fri 06 Feb 2015 14:10:40 GMT 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:
monitor: more accurate completion for host_net_remove()
net: del hub port when peer is deleted
net: remove the wrong comment in net_init_hubport()
monitor: print hub port name during info network
rtl8139: simplify timer logic
MAINTAINERS: add Jason Wang as net subsystem maintainer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer')
0 files changed, 0 insertions, 0 deletions