diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 18:08:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 18:08:19 +0200 |
| commit | e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f (patch) | |
| tree | 45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec /MAINTAINERS | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | apm-emulation: apm_mutex breaks ACK; remove it (diff) | |
| download | linux-e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f.tar.xz 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-- | MAINTAINERS | 5 |
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> |