Pull dock into test branch

diff --combined drivers/acpi/Kconfig
index 89eacd1,82289f1..56c5ba8
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -107,6 -107,7 +107,6 @@@ config ACPI_BUTTO
  config ACPI_VIDEO
        tristate "Video"
        depends on X86
 -      default y
        help
          This driver implement the ACPI Extensions For Display Adapters
          for integrated graphics devices on motherboard, as specified in
@@@ -132,6 -133,12 +132,12 @@@ config ACPI_FA
          This driver adds support for ACPI fan devices, allowing user-mode 
          applications to perform basic fan control (on, off, status).
  
+ config ACPI_DOCK
+       tristate "Dock"
+       depends on EXPERIMENTAL
+       help
+         This driver adds support for ACPI controlled docking stations
+ 
  config ACPI_PROCESSOR
        tristate "Processor"
        default y
@@@ -206,6 -213,7 +212,7 @@@ config ACPI_IB
  config ACPI_IBM_DOCK
        bool "Legacy Docking Station Support"
        depends on ACPI_IBM
+       depends on ACPI_DOCK=n
        default n
        ---help---
          Allows the ibm_acpi driver to handle docking station events.
@@@ -349,6 -357,7 +356,6 @@@ config ACPI_SB
        tristate "Smart Battery System (EXPERIMENTAL)"
        depends on X86 && I2C
        depends on EXPERIMENTAL
 -      default y
        help
          This driver adds support for the Smart Battery System.
          Depends on I2C (Device Drivers ---> I2C support)