]> Git Repo - linux.git/commitdiff
Merge branch 'pdf_fixes_v1' of https://git.linuxtv.org/mchehab/experimental into...
authorJonathan Corbet <[email protected]>
Mon, 22 Jul 2019 19:51:20 +0000 (13:51 -0600)
committerJonathan Corbet <[email protected]>
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
index 783569e3c4b48752c3555e9bee6fbc87adad5117,5fe6fd59713841b792a7a9c4617905d4f2bc28bb..ff3ae2be274640d8aab9215deaba4a7251e4f387
@@@ -12133,11 -12093,10 +12133,11 @@@ F:        Documentation/driver-api/parport*.rs
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <[email protected]>
 -M:    Alok Kataria <[email protected]>
 +M:    Thomas Hellstrom <[email protected]>
 +M:    "VMware, Inc." <[email protected]>
  L:    [email protected]
  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
This page took 0.156294 seconds and 4 git commands to generate.