diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:27:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:27:12 -0400 |
| commit | 41c9229498a2eb89db1c0a77321c61b448738de4 (patch) | |
| tree | 63e4c4b36191a46ead79160607cb907145f453f5 /MAINTAINERS | |
| parent | bf7394ccc13fe291d9258f01113b4c61214ddeae (diff) | |
| parent | 5ed459102d1e914972d65dd4ea9f26073143a4e9 (diff) | |
Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6
* 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6:
acer-wmi: remove debugfs entries upon unloading
ACPI: Avoid bogus timeout about SMbus check
fujitsu-laptop: fix regression for P8010 in 2.6.27-rc
ACPI: Make Len Brown the ACPI maintainer again
ACPI: thinkpad-acpi: wan radio control is not experimental
PNPACPI: ignore the producer/consumer bit for extended IRQ descriptors
acpi: add checking for NULL early param
ACPI: Fix typo in "Disable MWAIT via DMI on broken Compal board"
ACPI: Fix now signed module parameter.
ACPI: Change package length error to warning
ACPI: Fix now signed module parameter.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ced3c202f8e..af279458b61 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -222,8 +222,7 @@ W: http://code.google.com/p/aceracpi | |||
| 222 | S: Maintained | 222 | S: Maintained |
| 223 | 223 | ||
| 224 | ACPI | 224 | ACPI |
| 225 | P: Andi Kleen | 225 | P: Len Brown |
| 226 | M: ak@linux.intel.com | ||
| 227 | M: lenb@kernel.org | 226 | M: lenb@kernel.org |
| 228 | L: linux-acpi@vger.kernel.org | 227 | L: linux-acpi@vger.kernel.org |
| 229 | W: http://www.lesswatts.org/projects/acpi/ | 228 | W: http://www.lesswatts.org/projects/acpi/ |