Merge remote-tracking branch 'ia64/next'

Conflicts:
	arch/ia64/configs/generic_defconfig
	arch/ia64/configs/gensparse_defconfig
	arch/ia64/configs/tiger_defconfig
	arch/ia64/configs/xen_domu_defconfig

diff --cc arch/ia64/configs/generic_defconfig
index efbd2929aeb75c563b5ccbf4b267be596ce921e2,a4bd0ef738e2338c9f0a37cc50c4914fa6c61bea..9a21142630f6ac0b57bd884cfe7760553b81fdbd
--- 1/arch/ia64/configs/generic_defconfig
--- 2/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@@ -31,8 -31,8 +31,8 @@@ CONFIG_ACPI_FAN=
  CONFIG_ACPI_DOCK=y
  CONFIG_ACPI_PROCESSOR=m
  CONFIG_ACPI_CONTAINER=m
 -CONFIG_HOTPLUG_PCI=m
 +CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
  CONFIG_INET=y

diff --cc arch/ia64/configs/gensparse_defconfig
index f64980dd20c3f3851174c25c63152578910f255d,5e5f074136794a8fee74b7e37d188847b83de5ee..ea42ec525d48b9cd7a47f821e640124ff8aa8049
--- 1/arch/ia64/configs/gensparse_defconfig
--- 2/arch/ia64/configs/gensparse_defconfig
+++ b/arch/ia64/configs/gensparse_defconfig
@@@ -25,8 -25,8 +25,8 @@@ CONFIG_ACPI_BUTTON=
  CONFIG_ACPI_FAN=m
  CONFIG_ACPI_PROCESSOR=m
  CONFIG_ACPI_CONTAINER=m
 -CONFIG_HOTPLUG_PCI=m
 +CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
  CONFIG_INET=y

diff --cc arch/ia64/configs/tiger_defconfig
index 0f4e9e41f130623baae948b022dbd01468869331,7049c3dc6281acd96ae7cebf1b69f5732f5d86b2..0e983435f1133f0a600c3853c24638bd71744b58
--- 1/arch/ia64/configs/tiger_defconfig
--- 2/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@@ -31,8 -31,8 +31,8 @@@ CONFIG_ACPI_BUTTON=
  CONFIG_ACPI_FAN=m
  CONFIG_ACPI_PROCESSOR=m
  CONFIG_ACPI_CONTAINER=m
 -CONFIG_HOTPLUG_PCI=m
 +CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
  CONFIG_INET=y

diff --cc arch/ia64/configs/xen_domu_defconfig
index b025acfde5c1dc4fff39be616007fd7391f11276,7dc6ed7c42c23acd354ade83ced12ae597b908be..8baf2e6f126b1545ceafe32a2d95f5246f9d3aae
--- 1/arch/ia64/configs/xen_domu_defconfig
--- 2/arch/ia64/configs/xen_domu_defconfig
+++ b/arch/ia64/configs/xen_domu_defconfig
@@@ -32,8 -32,8 +32,8 @@@ CONFIG_ACPI_BUTTON=
  CONFIG_ACPI_FAN=m
  CONFIG_ACPI_PROCESSOR=m
  CONFIG_ACPI_CONTAINER=m
 -CONFIG_HOTPLUG_PCI=m
 +CONFIG_HOTPLUG_PCI=y
- CONFIG_HOTPLUG_PCI_ACPI=m
+ CONFIG_HOTPLUG_PCI_ACPI=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
  CONFIG_INET=y