Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 78105b3a5262..1a4ed64586a7 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -176,7 +176,6 @@ config ACPI_FAN
 
 config ACPI_DOCK
         bool "Dock"
-        depends on EXPERIMENTAL
         help
           This driver supports ACPI-controlled docking stations and removable
           drive bays such as the IBM Ultrabay and the Dell Module Bay.
@@ -202,7 +201,7 @@ config ACPI_PROCESSOR
           the module will be called processor.
 config ACPI_IPMI
         tristate "IPMI"
-        depends on EXPERIMENTAL && IPMI_SI && IPMI_HANDLER
+        depends on IPMI_SI && IPMI_HANDLER
         default n
         help
           This driver enables the ACPI to access the BMC controller. And it
@@ -214,14 +213,13 @@ config ACPI_IPMI
 
 config ACPI_HOTPLUG_CPU
         bool
-        depends on EXPERIMENTAL && ACPI_PROCESSOR && HOTPLUG_CPU
+        depends on ACPI_PROCESSOR && HOTPLUG_CPU
         select ACPI_CONTAINER
         default y
 
 config ACPI_PROCESSOR_AGGREGATOR
         tristate "Processor Aggregator"
         depends on ACPI_PROCESSOR
-        depends on EXPERIMENTAL
         depends on X86
         help
           ACPI 4.0 defines processor Aggregator, which enables OS to perform
@@ -337,8 +335,7 @@ config X86_PM_TIMER
           systems require this timer. 
 
 config ACPI_CONTAINER
-        bool "Container and Module Devices (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "Container and Module Devices"
         default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
         help
           This driver supports ACPI Container and Module devices (IDs