From: Linus Torvalds Date: Sun, 4 Oct 2009 22:03:00 +0000 (-0700) Subject: Merge branch 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... X-Git-Tag: v2.6.32-rc3~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e5027bd26ed4df735d29e66cd5c1c9b5959a587;p=profile%2Fcommon%2Fkernel-common.git Merge branch 'acpi-pad' of git://git./linux/kernel/git/lenb/linux-acpi-2.6 * '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. --- 5e5027bd26ed4df735d29e66cd5c1c9b5959a587 diff --cc MAINTAINERS index 737a9b2,082df56..09a2028 --- a/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 + 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 L: linux-acpi@vger.kernel.org W: http://www.lesswatts.org/projects/acpi/ S: Supported