• P
    Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging · a20fd901
    Peter Maydell 提交于
    trivial patches for 2016-10-08
    
    # gpg: Signature made Sat 08 Oct 2016 09:56:38 BST
    # gpg:                using RSA key 0x701B4F6B1A693E59
    # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
    # gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
    # gpg:                 aka "Michael Tokarev <mjt@debian.org>"
    # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
    #      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59
    
    * remotes/mjt/tags/trivial-patches-fetch: (26 commits)
      net/filter-mirror: Fix mirror initial check typo
      virtio: rename the bar index field name in VirtIOPCIProxy
      linux-user: include <poll.h> instead of <sys/poll.h>
      char: fix missing return in error path for chardev TLS init
      CODING_STYLE: Fix a typo ("have" vs. "has")
      bitmap: refine and move BITMAP_{FIRST/LAST}_WORD_MASK
      build-sys: fix find-in-path
      m68k: change default system clock for m5208evb
      exec: remove unused compacted argument
      usb: ehci: fix memory leak in ehci_process_itd
      qapi: make the json schema files more regular.
      maint: Add module_block.h to .gitignore
      MAINTAINERS: Some updates related to the SH4 machines
      MAINTAINERS: Add some more MIPS related files
      MAINTAINERS: Add usermode related config files
      MAINTAINERS: Add some more pattern to recognize all win32 related files
      MAINTAINERS: Add some more rocker related files
      MAINTAINERS: Add header files to CRIS section
      MAINTAINERS: Add some more files to the virtio section
      MAINTAINERS: Add some SPARC machine related files
      ...
    
    # Conflicts:
    #	MAINTAINERS
    a20fd901
MAINTAINERS 34.6 KB