Merge branch 'pdf_fixes_v1' of https://git.linuxtv.org/mchehab/experimental into...
authorJonathan Corbet <corbet@lwn.net>
Mon, 22 Jul 2019 19:51:20 +0000 (13:51 -0600)
committerJonathan Corbet <corbet@lwn.net>
Mon, 22 Jul 2019 19:51:20 +0000 (13:51 -0600)
Bring in a set of post-thrashup fixes from Mauro.

1  2 
Documentation/watchdog/hpwdt.rst
MAINTAINERS
drivers/gpu/drm/drm_modes.c

Simple merge
diff --cc MAINTAINERS
@@@ -12133,11 -12093,10 +12133,11 @@@ F:        Documentation/driver-api/parport*.rs
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <jgross@suse.com>
 -M:    Alok Kataria <akataria@vmware.com>
 +M:    Thomas Hellstrom <thellstrom@vmware.com>
 +M:    "VMware, Inc." <pv-drivers@vmware.com>
  L:    virtualization@lists.linux-foundation.org
  S:    Supported
- F:    Documentation/virtual/paravirt_ops.txt
+ F:    Documentation/virtual/paravirt_ops.rst
  F:    arch/*/kernel/paravirt*
  F:    arch/*/include/asm/paravirt*.h
  F:    include/linux/hypervisor.h
Simple merge