From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 24 Apr 2015 00:18:52 +0000 (+0200)
Subject: Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'
X-Git-Tag: v4.1-rc1~8^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e0155a99b28f63e007c0c74076ad8ae486a3c9d3;p=users%2Fdwmw2%2Flinux.git
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()
---
e0155a99b28f63e007c0c74076ad8ae486a3c9d3
diff --cc MAINTAINERS
index f7bbaece56498,e1ec7785005c6,f7bbaece56498,0e1abe8cc6840..779d1df5fba90
--- a/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