Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'

* acpi-dock:
  MAINTAINERS: remove maintainship entry of docking station driver

* acpi-ec:
  ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()

* acpi-scan:
  ACPI / scan: Add a scan handler for PRP0001
  ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()

diff --cc MAINTAINERS
index f7bbaece56498fcc75b722c042c9a1678a629b81,e1ec7785005c67e216761ba833c7248ca51fbf8f,f7bbaece56498fcc75b722c042c9a1678a629b81,0e1abe8cc6840369966a5dc3a754f23a8eca94ab..779d1df5fba90d1aa8775038cc98d9990cb08478
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
--- 4/MAINTAINERS
+++ b/MAINTAINERS
@@@@@ -625,19 -625,19 -625,19 -625,20 +625,19 @@@@@ F:  drivers/iommu/amd_iommu*.[ch
    F:  include/linux/amd-iommu.h
    
    AMD KFD
 - -M:      Oded Gabbay <oded.gabbay@amd.com>
 - -L:      dri-devel@lists.freedesktop.org
 - -T:      git git://people.freedesktop.org/~gabbayo/linux.git
 - -S:      Supported
 - -F:      drivers/gpu/drm/amd/amdkfd/
 + +M:  Oded Gabbay <oded.gabbay@amd.com>
 + +L:  dri-devel@lists.freedesktop.org
 + +T:  git git://people.freedesktop.org/~gabbayo/linux.git
 + +S:  Supported
 + +F:  drivers/gpu/drm/amd/amdkfd/
    F:  drivers/gpu/drm/amd/include/cik_structs.h
    F:  drivers/gpu/drm/amd/include/kgd_kfd_interface.h
 - -F:      drivers/gpu/drm/radeon/radeon_kfd.c
 - -F:      drivers/gpu/drm/radeon/radeon_kfd.h
 - -F:      include/uapi/linux/kfd_ioctl.h
 + +F:  drivers/gpu/drm/radeon/radeon_kfd.c
 + +F:  drivers/gpu/drm/radeon/radeon_kfd.h
 + +F:  include/uapi/linux/kfd_ioctl.h
    
    AMD MICROCODE UPDATE SUPPORT
   -M:  Andreas Herrmann <herrmann.der.user@googlemail.com>
   -L:  amd64-microcode@amd64.org
   +M:  Borislav Petkov <bp@alien8.de>
    S:  Maintained
    F:  arch/x86/kernel/cpu/microcode/amd*
    
@@@@@ -3265,19 -3265,13 -3265,19 -3252,12 +3265,13 @@@@@ S:     Maintaine
    F:  Documentation/hwmon/dme1737
    F:  drivers/hwmon/dme1737.c
    
   -DOCKING STATION DRIVER
   -M:  Shaohua Li <shaohua.li@intel.com>
   -L:  linux-acpi@vger.kernel.org
   -S:  Supported
   -F:  drivers/acpi/dock.c
   +DMI/SMBIOS SUPPORT
   +M:  Jean Delvare <jdelvare@suse.de>
   +S:  Maintained
   +F:  drivers/firmware/dmi-id.c
   +F:  drivers/firmware/dmi_scan.c
   +F:  include/linux/dmi.h
    
- - DOCKING STATION DRIVER
- - M:  Shaohua Li <shaohua.li@intel.com>
- - L:  linux-acpi@vger.kernel.org
- - S:  Supported
- - F:  drivers/acpi/dock.c
- - 
    DOCUMENTATION
    M:  Jonathan Corbet <corbet@lwn.net>
    L:  linux-doc@vger.kernel.org