diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:08:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:08:19 -0400 |
| commit | e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f (patch) | |
| tree | 45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec /MAINTAINERS | |
| parent | 710421cc7d295cc59eb2676fe2ba3bc3252c124e (diff) | |
| parent | fda5fe19725edd6805f2fd742235d1a0d0ba93f5 (diff) | |
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 | |||
| 548 | F: sound/aoa/ | 548 | F: sound/aoa/ |
| 549 | 549 | ||
| 550 | APM DRIVER | 550 | APM DRIVER |
| 551 | L: linux-laptop@vger.kernel.org | 551 | M: Jiri Kosina <jkosina@suse.cz> |
| 552 | S: Orphan | 552 | S: Odd fixes |
| 553 | F: arch/x86/kernel/apm_32.c | 553 | F: arch/x86/kernel/apm_32.c |
| 554 | F: include/linux/apm_bios.h | 554 | F: include/linux/apm_bios.h |
| 555 | F: drivers/char/apm-emulation.c | ||
| 555 | 556 | ||
| 556 | APPLE BCM5974 MULTITOUCH DRIVER | 557 | APPLE BCM5974 MULTITOUCH DRIVER |
| 557 | M: Henrik Rydberg <rydberg@euromail.se> | 558 | M: Henrik Rydberg <rydberg@euromail.se> |