From: Jonathan Corbet <corbet@lwn.net>
Date: Mon, 22 Jul 2019 19:51:20 +0000 (-0600)
Subject: Merge branch 'pdf_fixes_v1' of https://git.linuxtv.org/mchehab/experimental into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=48ffc3d12b55bed8d9452a89bc13de4864dc3106;p=linux.git

Merge branch 'pdf_fixes_v1' of https://git.linuxtv.org/mchehab/experimental into mauro

Bring in a set of post-thrashup fixes from Mauro.
---

48ffc3d12b55bed8d9452a89bc13de4864dc3106
diff --cc MAINTAINERS
index 783569e3c4b48,5fe6fd5971384..ff3ae2be27464
--- a/MAINTAINERS
+++ b/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