From: Peter Maydell Date: Mon, 28 Jul 2014 10:05:14 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-07-26' into staging X-Git-Tag: qemu-xen-4.6.0-rc1~283 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef;p=qemu-xen.git Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-07-26' into staging trivial patches for 2014-07-26 # gpg: Signature made Sat 26 Jul 2014 08:16:55 BST using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB * remotes/mjt/tags/trivial-patches-2014-07-26: qemu-options: fix another allows-to for -net l2tpv3 Signed-off-by: Peter Maydell --- f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef