Merge branch 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

* 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  acpi_pad: build only on X86
  ACPI: create Processor Aggregator Device driver

Fixup trivial conflicts in MAINTAINERS file.

diff --cc MAINTAINERS
index 737a9b2c532d20c430b5d67a3a1dc72ea30df1a6,082df56d5b9acdf262bd8263c746049cbddcc030..09a2028bab7f78786266c10fe1d2f99b0e1e263c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -257,8 -281,24 +257,15 @@@ W:       http://www.lesswatts.org/projects/ac
  S:    Supported
  F:    drivers/acpi/fan.c
  
 -ACPI PCI HOTPLUG DRIVER
 -P:    Kristen Carlson Accardi
 -M:    kristen.c.accardi@intel.com
 -L:    linux-pci@vger.kernel.org
 -S:    Supported
 -F:    drivers/pci/hotplug/acpi*
 -
+ ACPI PROCESSOR AGGREGATOR DRIVER
 -P:    Shaohua Li
 -M:    shaohua.li@intel.com
++M:    Shaohua Li <shaohua.li@intel.com>
+ L:    linux-acpi@vger.kernel.org
+ W:    http://www.lesswatts.org/projects/acpi/
+ S:    Supported
+ F:    drivers/acpi/acpi_pad.c
+ 
  ACPI THERMAL DRIVER
 -P:    Zhang Rui
 -M:    rui.zhang@intel.com
 +M:    Zhang Rui <rui.zhang@intel.com>
  L:    linux-acpi@vger.kernel.org
  W:    http://www.lesswatts.org/projects/acpi/
  S:    Supported

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/Makefile
Simple merge