summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-23 09:08:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-23 09:08:19 -0700
commite0c6b8a17fb3d4a740386b380ea72aa8388fbf2f (patch)
tree45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec /MAINTAINERS
parent710421cc7d295cc59eb2676fe2ba3bc3252c124e (diff)
parentfda5fe19725edd6805f2fd742235d1a0d0ba93f5 (diff)
downloadlinux-e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f.tar.gz
linux-e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f.tar.bz2
linux-e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm: apm-emulation: apm_mutex breaks ACK; remove it APM: take over maintainership
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0c916367ae7c..1026e61c7d98 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -548,10 +548,11 @@ S: Maintained
F: sound/aoa/
APM DRIVER
-L: linux-laptop@vger.kernel.org
-S: Orphan
+M: Jiri Kosina <jkosina@suse.cz>
+S: Odd fixes
F: arch/x86/kernel/apm_32.c
F: include/linux/apm_bios.h
+F: drivers/char/apm-emulation.c
APPLE BCM5974 MULTITOUCH DRIVER
M: Henrik Rydberg <rydberg@euromail.se>