]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160411' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 11 Apr 2016 13:37:53 +0000 (14:37 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 11 Apr 2016 13:37:53 +0000 (14:37 +0100)
target-arm queue:
 * stellaris_enet: don't overrun buffer if fed oversize packet

# gpg: Signature made Mon 11 Apr 2016 14:36:27 BST using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"

* remotes/pmaydell/tags/pull-target-arm-20160411:
  net: stellaris_enet: check packet length against receive buffer

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

Trivial merge