diff options
| author | Len Brown <len.brown@intel.com> | 2007-04-28 23:11:19 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-28 23:11:19 -0400 |
| commit | f188291aec9b17ef7cec01db66b9cdb6fae26372 (patch) | |
| tree | 9ed965938f635be09b0d124e91fd4aec07701714 /MAINTAINERS | |
| parent | cfaae3ee4a0d00c6b22780057e958d625499e90c (diff) | |
| parent | 836a53f42f3b5d5cb3a0751587ea33801e4b120d (diff) | |
| download | linux-3.10-f188291aec9b17ef7cec01db66b9cdb6fae26372.tar.gz linux-3.10-f188291aec9b17ef7cec01db66b9cdb6fae26372.tar.bz2 linux-3.10-f188291aec9b17ef7cec01db66b9cdb6fae26372.zip | |
Pull thinkpad into release branch
Conflicts:
drivers/misc/Kconfig
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 277877a34ef..d0243d07da2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1632,15 +1632,6 @@ 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 @@ -3121,6 +3112,15 @@ P: Chris Zankel M: chris@zankel.net S: Maintained +THINKPAD 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 + UltraSPARC (sparc64): P: David S. Miller M: davem@davemloft.net |