diff options
| author |   Peter Maydell <peter.maydell@linaro.org> | 2015-09-17 13:07:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-17 13:07:50 +0100 |
| commit | cc450bfdc030d1943d99b3cb526a3e2cb4f3cd72 (patch) | |
| tree | 63f9341b8527f97df640d86ed8ea371f3c21e8b2 /util/qemu-error.c | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | net: smc91c111: flush packets on RCR register changes (diff) | |
| download | qemu-cc450bfdc030d1943d99b3cb526a3e2cb4f3cd72.tar.xz qemu-cc450bfdc030d1943d99b3cb526a3e2cb4f3cd72.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Thu 17 Sep 2015 12:43:56 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: smc91c111: flush packets on RCR register changes
net: smc91c111: gate can_receive() on rx FIFO having a slot
net: smc91c111: guard flush_queued_packets() on can_rx()
MAINTAINERS: Stefan will not maintain net subsystem
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-error.c')
0 files changed, 0 insertions, 0 deletions