Merge branch 'topstar-laptop' into release

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 43761a0..bb2c683 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5046,6 +5046,11 @@ T:       quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches
 S:     Maintained
 F:     security/tomoyo/
 
+TOPSTAR LAPTOP EXTRAS DRIVER
+M:     Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+S:     Maintained
+F:     drivers/platform/x86/topstar-laptop.c
+
 TOSHIBA ACPI EXTRAS DRIVER
 S:     Orphan
 F:     drivers/platform/x86/toshiba_acpi.c