diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 00:45:07 -0500 |
| commit | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (patch) | |
| tree | 1b9171c109496b7f4991fcae0a2e08ed3bbea10d /MAINTAINERS | |
| parent | 25c68a33b7b74b37793b1250007e5e21d621a7fc (diff) | |
| parent | 7d63c6759188b9b35c789159f6e02cd02d49ec7d (diff) | |
| download | linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.tar.gz linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.tar.bz2 linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.zip | |
Pull trivial into test branch
Conflicts:
drivers/acpi/ec.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dea5b2a6de0a..7f7c7db174cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1397,6 +1397,15 @@ W: http://www.ia64-linux.org/ T: git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git S: Maintained +IBM ACPI EXTRAS DRIVER +P: Henrique de Moraes Holschuh +M: ibm-acpi@hmh.eng.br +L: ibm-acpi-devel@lists.sourceforge.net +W: http://ibm-acpi.sourceforge.net +W: http://thinkwiki.org/wiki/Ibm-acpi +T: git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git +S: Maintained + SN-IA64 (Itanium) SUB-PLATFORM P: Jes Sorensen M: jes@sgi.com |