Merge tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull more power management and ACPI updates from Rafael Wysocki:
 "These are fixes mostly (intel_pstate, ACPI core, ACPI EC driver,
  cpupower tool), a new CPU ID for the Intel RAPL driver and one
  intel_pstate driver improvement that didn't make it to my previous
  pull requests due to timing.

  Specifics:

   - Fix a build warning in the intel_pstate driver showing up in
     non-SMP builds (Borislav Petkov)

   - Change one of the intel_pstate's P-state selection parameters for
     Baytrail and Cherrytrail CPUs to significantly improve performance
     at the cost of a small increase in energy consumption (Kristen
     Carlson Accardi)

   - Fix a NULL pointer dereference in the ACPI EC driver due to an
     unsafe list walk in the query handler removal routine (Chris
     Bainbridge)

   - Get rid of a false-positive lockdep warning in the ACPI container
     hot-remove code (Rafael J Wysocki)

   - Prevent the ACPI device enumeration code from creating device
     objects of a wrong type in some cases (Rafael J Wysocki)

   - Add Skylake processors support to the Intel RAPL power capping
     driver (Brian Bian)

   - Drop the stale MAINTAINERS entry for the ACPI dock driver that is
     regarded as part of the ACPI core and maintained along with it now
     (Chao Yu)

   - Fix cpupower tool breakage caused by a library API change in libpci
     3.3.0 (Lucas Stach)"

* tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / scan: Add a scan handler for PRP0001
  ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
  ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()
  MAINTAINERS: remove maintainship entry of docking station driver
  powercap / RAPL: Add support for Intel Skylake processors
  cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
  intel_pstate: Change the setpoint for Atom params
  cpupower: fix breakage from libpci API change

diff --combined MAINTAINERS
index 2b38266d592acd66e71db39e19a4ed4437dd4e7c,779d1df5fba90d1aa8775038cc98d9990cb08478..2e5bbc0d68b26e188e2d7e8154cf80e47fabdda1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -569,12 -569,6 +569,12 @@@ L:       nios2-dev@lists.rocketboards.org (mo
  S:    Maintained
  F:    drivers/mailbox/mailbox-altera.c
  
 +ALTERA PIO DRIVER
 +M:    Tien Hock Loh <thloh@altera.com>
 +L:    linux-gpio@vger.kernel.org
 +S:    Maintained
 +F:    drivers/gpio/gpio-altera.c
 +
  ALTERA TRIPLE SPEED ETHERNET DRIVER
  M:    Vince Bridgers <vbridger@opensource.altera.com>
  L:    netdev@vger.kernel.org
@@@ -886,11 -880,6 +886,11 @@@ S:       Maintaine
  F:    drivers/media/rc/meson-ir.c
  N:    meson[x68]
  
 +ARM/Annapurna Labs ALPINE ARCHITECTURE
 +M:    Tsahee Zidenberg <tsahee@annapurnalabs.com>
 +S:    Maintained
 +F:    arch/arm/mach-alpine/
 +
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <linux@maxim.org.za>
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
@@@ -963,7 -952,7 +963,7 @@@ ARM/CORESIGHT FRAMEWORK AND DRIVER
  M:    Mathieu Poirier <mathieu.poirier@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/coresight/*
 +F:    drivers/hwtracing/coresight/*
  F:    Documentation/trace/coresight.txt
  F:    Documentation/devicetree/bindings/arm/coresight.txt
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
@@@ -1266,6 -1255,22 +1266,6 @@@ L:     openmoko-kernel@lists.openmoko.org (
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
  S:    Supported
  
 -ARM/QUALCOMM MSM MACHINE SUPPORT
 -M:    David Brown <davidb@codeaurora.org>
 -M:    Daniel Walker <dwalker@fifo99.com>
 -M:    Bryan Huntsman <bryanh@codeaurora.org>
 -L:    linux-arm-msm@vger.kernel.org
 -F:    arch/arm/mach-msm/
 -F:    drivers/video/fbdev/msm/
 -F:    drivers/mmc/host/msm_sdcc.c
 -F:    drivers/mmc/host/msm_sdcc.h
 -F:    drivers/tty/serial/msm_serial.h
 -F:    drivers/tty/serial/msm_serial.c
 -F:    drivers/*/pm8???-*
 -F:    drivers/mfd/ssbi.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
 -S:    Maintained
 -
  ARM/TOSA MACHINE SUPPORT
  M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  M:    Dirk Opfer <dirk@opfer-online.de>
@@@ -1323,11 -1328,6 +1323,11 @@@ L:    linux-soc@vger.kernel.or
  S:    Maintained
  F:    arch/arm/mach-qcom/
  F:    drivers/soc/qcom/
 +F:    drivers/tty/serial/msm_serial.h
 +F:    drivers/tty/serial/msm_serial.c
 +F:    drivers/*/pm8???-*
 +F:    drivers/mfd/ssbi.c
 +F:    drivers/firmware/qcom_scm.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
@@@ -1426,9 -1426,11 +1426,9 @@@ F:     arch/arm/boot/dts/emev2
  F:    arch/arm/boot/dts/r7s*
  F:    arch/arm/boot/dts/r8a*
  F:    arch/arm/boot/dts/sh*
 -F:    arch/arm/configs/ape6evm_defconfig
  F:    arch/arm/configs/armadillo800eva_defconfig
  F:    arch/arm/configs/bockw_defconfig
  F:    arch/arm/configs/kzm9g_defconfig
 -F:    arch/arm/configs/mackerel_defconfig
  F:    arch/arm/configs/marzen_defconfig
  F:    arch/arm/configs/shmobile_defconfig
  F:    arch/arm/include/debug/renesas-scif.S
@@@ -1820,7 -1822,7 +1820,7 @@@ S:      Supporte
  F:    drivers/spi/spi-atmel.*
  
  ATMEL SSC DRIVER
 -M:    Bo Shen <voice.shen@atmel.com>
 +M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/misc/atmel-ssc.c
@@@ -2569,7 -2571,6 +2569,7 @@@ F:      include/linux/cleancache.
  
  CLK API
  M:    Russell King <linux@arm.linux.org.uk>
 +L:    linux-clk@vger.kernel.org
  S:    Maintained
  F:    include/linux/clk.h
  
@@@ -2630,7 -2631,7 +2630,7 @@@ F:      drivers/media/platform/coda
  COMMON CLK FRAMEWORK
  M:    Mike Turquette <mturquette@linaro.org>
  M:    Stephen Boyd <sboyd@codeaurora.org>
 -L:    linux-kernel@vger.kernel.org
 +L:    linux-clk@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  S:    Maintained
  F:    drivers/clk/
@@@ -3066,16 -3067,10 +3066,16 @@@ F:   drivers/net/fddi/defxx.
  
  DELL LAPTOP DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
 +M:    Pali Rohár <pali.rohar@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/dell-laptop.c
  
 +DELL LAPTOP FREEFALL DRIVER
 +M:    Pali Rohár <pali.rohar@gmail.com>
 +S:    Maintained
 +F:    drivers/platform/x86/dell-smo8800.c
 +
  DELL LAPTOP SMM DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
  S:    Maintained
@@@ -3090,7 -3085,6 +3090,7 @@@ F:      drivers/firmware/dcdbas.
  
  DELL WMI EXTRAS DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
 +M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
@@@ -3278,12 -3272,6 +3278,6 @@@ F:     drivers/firmware/dmi-id.
  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
@@@ -3291,9 -3279,7 +3285,9 @@@ S:      Maintaine
  F:    Documentation/
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
 -X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
 +X:    Documentation/acpi
 +X:    Documentation/power
 +X:    Documentation/spi
  T:    git git://git.lwn.net/linux-2.6.git docs-next
  
  DOUBLETALK DRIVER
@@@ -3417,6 -3403,7 +3411,6 @@@ T:      git git://people.freedesktop.org/~ai
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
 -F:    include/linux/platform_data/rcar-du.h
  F:    include/linux/platform_data/shmob_drm.h
  
  DSBR100 USB FM RADIO DRIVER
@@@ -4473,7 -4460,7 +4467,7 @@@ S:      Maintaine
  F:    block/partitions/efi.*
  
  STK1160 USB VIDEO CAPTURE DRIVER
 -M:    Ezequiel Garcia <elezegarcia@gmail.com>
 +M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
@@@ -5016,11 -5003,6 +5010,11 @@@ W:    http://industrypack.sourceforge.ne
  S:    Maintained
  F:    drivers/ipack/
  
 +INGENIC JZ4780 DMA Driver
 +M:    Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
 +S:    Maintained
 +F:    drivers/dma/dma-jz4780.c
 +
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
  M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
@@@ -6170,6 -6152,16 +6164,6 @@@ Q:     http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/m88rs2000*
  
 -M88TS2022 MEDIA DRIVER
 -M:    Antti Palosaari <crope@iki.fi>
 -L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 -W:    http://palosaari.fi/linux/
 -Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -T:    git git://linuxtv.org/anttip/media_tree.git
 -S:    Maintained
 -F:    drivers/media/tuners/m88ts2022*
 -
  MA901 MASTERKIT USB FM RADIO DRIVER
  M:    Alexey Klimov <klimov.linux@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -6593,7 -6585,6 +6587,7 @@@ M:      Laurent Pinchart <laurent.pinchart@i
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/mt9v032.txt
  F:    drivers/media/i2c/mt9v032.c
  F:    include/media/mt9v032.h
  
@@@ -7011,8 -7002,6 +7005,8 @@@ Q:      http://patchwork.kernel.org/project/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  S:    Maintained
  F:    arch/arm/*omap*/
 +F:    arch/arm/configs/omap1_defconfig
 +F:    arch/arm/configs/omap2plus_defconfig
  F:    drivers/i2c/busses/i2c-omap.c
  F:    drivers/irqchip/irq-omap-intc.c
  F:    drivers/mfd/*omap*.c
@@@ -7143,7 -7132,6 +7137,7 @@@ OMAP IMAGING SUBSYSTEM (OMAP3 ISP and O
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 +F:    Documentation/devicetree/bindings/media/ti,omap3isp.txt
  F:    drivers/media/platform/omap3isp/
  F:    drivers/staging/media/omap4iss/
  
@@@ -7243,15 -7231,6 +7237,15 @@@ F:    Documentation/devicetree
  F:    arch/*/boot/dts/
  F:    include/dt-bindings/
  
 +OPEN FIRMWARE AND DEVICE TREE OVERLAYS
 +M:    Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 +L:    devicetree@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/dynamic-resolution-notes.txt
 +F:    Documentation/devicetree/overlay-notes.txt
 +F:    drivers/of/overlay.c
 +F:    drivers/of/resolver.c
 +
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <jonas@southpole.se>
  W:    http://openrisc.net
@@@ -7545,6 -7524,7 +7539,6 @@@ S:      Maintaine
  F:    drivers/pci/host/pci-exynos.c
  
  PCI DRIVER FOR SYNOPSIS DESIGNWARE
 -M:    Mohit Kumar <mohit.kumar@st.com>
  M:    Jingoo Han <jg1.han@samsung.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
@@@ -7559,8 -7539,9 +7553,8 @@@ F:      Documentation/devicetree/bindings/pc
  F:    drivers/pci/host/pci-host-generic.c
  
  PCIE DRIVER FOR ST SPEAR13XX
 -M:    Mohit Kumar <mohit.kumar@st.com>
  L:    linux-pci@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/pci/host/*spear*
  
  PCMCIA SUBSYSTEM
@@@ -8126,12 -8107,6 +8120,12 @@@ S:    Maintaine
  F:    Documentation/blockdev/ramdisk.txt
  F:    drivers/block/brd.c
  
 +PERSISTENT MEMORY DRIVER
 +M:    Ross Zwisler <ross.zwisler@linux.intel.com>
 +L:    linux-nvdimm@lists.01.org
 +S:    Supported
 +F:    drivers/block/pmem.c
 +
  RANDOM NUMBER DRIVER
  M:    "Theodore Ts'o" <tytso@mit.edu>
  S:    Maintained
@@@ -8815,15 -8790,6 +8809,15 @@@ W:    http://www.emulex.co
  S:    Supported
  F:    drivers/net/ethernet/emulex/benet/
  
 +EMULEX ONECONNECT ROCE DRIVER
 +M:    Selvin Xavier <selvin.xavier@emulex.com>
 +M:    Devesh Sharma <devesh.sharma@emulex.com>
 +M:    Mitesh Ahuja <mitesh.ahuja@emulex.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.emulex.com
 +S:    Supported
 +F:    drivers/infiniband/hw/ocrdma/
 +
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <linux-net-drivers@solarflare.com>
  M:    Shradha Shah <sshah@solarflare.com>
@@@ -8997,16 -8963,6 +8991,16 @@@ T:    git git://linuxtv.org/mhadli/v4l-dvb
  S:    Maintained
  F:    drivers/media/platform/am437x/
  
 +OV2659 OMNIVISION SENSOR DRIVER
 +M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 +S:    Maintained
 +F:    drivers/media/i2c/ov2659.c
 +F:    include/media/ov2659.h
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -9956,23 -9912,10 +9950,23 @@@ S:   Maintaine
  F:    drivers/platform/x86/topstar-laptop.c
  
  TOSHIBA ACPI EXTRAS DRIVER
 +M:    Azael Avalos <coproscefalo@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    drivers/platform/x86/toshiba_acpi.c
  
 +TOSHIBA BLUETOOTH DRIVER
 +M:    Azael Avalos <coproscefalo@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/toshiba_bluetooth.c
 +
 +TOSHIBA HDD ACTIVE PROTECTION SENSOR DRIVER
 +M:    Azael Avalos <coproscefalo@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/toshiba_haps.c
 +
  TOSHIBA SMM DRIVER
  M:    Jonathan Buzzard <jonathan@buzzard.org.uk>
  L:    tlinux-users@tce.toshiba-dme.co.jp
@@@ -10549,12 -10492,6 +10543,12 @@@ S: Maintaine
  F:    drivers/vhost/
  F:    include/uapi/linux/vhost.h
  
 +VIRTIO INPUT DRIVER
 +M:    Gerd Hoffmann <kraxel@redhat.com>
 +S:    Maintained
 +F:    drivers/virtio/virtio_input.c
 +F:    include/uapi/linux/virtio_input.h
 +
  VIA RHINE NETWORK DRIVER
  M:    Roger Luethi <rl@hellgate.ch>
  S:    Maintained
@@@ -10630,14 -10567,6 +10624,14 @@@ L: linux-kernel@vger.kernel.or
  S:    Maintained
  F:    drivers/misc/vmw_balloon.c
  
 +VMWARE VMMOUSE SUBDRIVER
 +M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
 +M:    "VMware, Inc." <pv-drivers@vmware.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/input/mouse/vmmouse.c
 +F:    drivers/input/mouse/vmmouse.h
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <sbhatewara@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>
@@@ -10963,16 -10892,6 +10957,16 @@@ L: linux-serial@vger.kernel.or
  S:    Maintained
  F:    drivers/tty/serial/uartlite.c
  
 +XILINX VIDEO IP CORES
 +M:    Hyun Kwon <hyun.kwon@xilinx.com>
 +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Supported
 +F:    Documentation/devicetree/bindings/media/xilinx/
 +F:    drivers/media/platform/xilinx/
 +F:    include/uapi/linux/xilinx-v4l2-controls.h
 +
  XILLYBUS DRIVER
  M:    Eli Billauer <eli.billauer@gmail.com>
  L:    linux-kernel@vger.kernel.org