[Qemu-commits] [qemu/qemu] 2f47b4: qemu-options: fix another allows-to for -net l2tpv...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2f47b403bd494b6717ef14c0d278d4b2d364b382
      
https://github.com/qemu/qemu/commit/2f47b403bd494b6717ef14c0d278d4b2d364b382
  Author: Michael Tokarev <address@hidden>
  Date:   2014-07-26 (Sat, 26 Jul 2014)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: fix another allows-to for -net l2tpv3

Signed-off-by: Michael Tokarev <address@hidden>


  Commit: f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef
      
https://github.com/qemu/qemu/commit/f45c56e0166e86d3b309ae72f4cb8e3d0949c7ef
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/c60a57ff4976...f45c56e0166e