diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 11:55:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 11:55:57 -0500 |
| commit | d1398a6ff503a849f3c123bc5f0fdff383a1b6ec (patch) | |
| tree | 55f305f0170e667d2f1719be257ec8cf3ef7c6e6 /MAINTAINERS | |
| parent | 69e4d94818cabf44d845b9f4b46d88de6e518dcf (diff) | |
| parent | 0b67d94659a72734584a40b5e113e9261f97ae8c (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: asus_acpi: new MAINTAINER
ACPI: fix section mis-match build warning
ACPI: increase ACPI_MAX_REFERENCE_COUNT for larger systems
ACPI: EC: move verbose printk to debug build only
backlight: fix backlight_device_register compile failures
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7f6c051cac65..0f6d13bd4688 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -532,13 +532,13 @@ L: netdev@vger.kernel.org | |||
| 532 | S: Maintained | 532 | S: Maintained |
| 533 | 533 | ||
| 534 | ASUS ACPI EXTRAS DRIVER | 534 | ASUS ACPI EXTRAS DRIVER |
| 535 | P: Corentin Chary | ||
| 536 | M: corentincj@iksaif.net | ||
| 535 | P: Karol Kozimor | 537 | P: Karol Kozimor |
| 536 | M: sziwan@users.sourceforge.net | 538 | M: sziwan@users.sourceforge.net |
| 537 | P: Julien Lerouge | ||
| 538 | M: julien.lerouge@free.fr | ||
| 539 | L: acpi4asus-user@lists.sourceforge.net | 539 | L: acpi4asus-user@lists.sourceforge.net |
| 540 | W: http://sourceforge.net/projects/acpi4asus | 540 | W: http://sourceforge.net/projects/acpi4asus |
| 541 | W: http://julien.lerouge.free.fr | 541 | W: http://xf.iksaif.net/acpi4asus |
| 542 | S: Maintained | 542 | S: Maintained |
| 543 | 543 | ||
| 544 | ATA OVER ETHERNET DRIVER | 544 | ATA OVER ETHERNET DRIVER |