Merge remote-tracking branch 'remotes/stefanha/tags/CVE-2015-3209-pcnet-tx-buffer...
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 10 Jun 2015 14:10:14 +0000 (15:10 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 10 Jun 2015 14:10:14 +0000 (15:10 +0100)
# gpg: Signature made Wed Jun 10 15:04:11 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/CVE-2015-3209-pcnet-tx-buffer-fix-pull-request:
  pcnet: force the buffer access to be in bounds during tx

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge