diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 18:03:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 18:03:00 -0400 |
| commit | 5e5027bd26ed4df735d29e66cd5c1c9b5959a587 (patch) | |
| tree | 9b98ea464691aa865864033d52e2d123451fbf86 /MAINTAINERS | |
| parent | 6d5ee265c80a551726c49cc4e62663808a300af8 (diff) | |
| parent | d91f79ebc3191b15dbe385925af4840f4e68df77 (diff) | |
Merge branch 'acpi-pad' of git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 737a9b2c532d..09a2028bab7f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -257,6 +257,13 @@ W: http://www.lesswatts.org/projects/acpi/ | |||
| 257 | S: Supported | 257 | S: Supported |
| 258 | F: drivers/acpi/fan.c | 258 | F: drivers/acpi/fan.c |
| 259 | 259 | ||
| 260 | ACPI PROCESSOR AGGREGATOR DRIVER | ||
| 261 | M: Shaohua Li <shaohua.li@intel.com> | ||
| 262 | L: linux-acpi@vger.kernel.org | ||
| 263 | W: http://www.lesswatts.org/projects/acpi/ | ||
| 264 | S: Supported | ||
| 265 | F: drivers/acpi/acpi_pad.c | ||
| 266 | |||
| 260 | ACPI THERMAL DRIVER | 267 | ACPI THERMAL DRIVER |
| 261 | M: Zhang Rui <rui.zhang@intel.com> | 268 | M: Zhang Rui <rui.zhang@intel.com> |
| 262 | L: linux-acpi@vger.kernel.org | 269 | L: linux-acpi@vger.kernel.org |