diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 10:41:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 10:41:24 -0500 |
| commit | b037bba71bca77c7247e7c2079f227ad7b961c34 (patch) | |
| tree | 459896135ace66b9e690067e573e5da25b1df24d /MAINTAINERS | |
| parent | a03696e912cd544e1504a79e49600cdb535f42db (diff) | |
| parent | 51c1410bd651609aafbcc3a2294df26a47bf6137 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (45 commits)
compal-laptop: Make it depend on CONFIG_RFKILL
classmate-laptop: Added some keys present in other devices
MAINTAINERS: Add git tree to x86 Platform Drivers
asus-acpi: remove duplicate comparison of asus_model strings
toshiba-acpi: fix multimedia keys on some machines
dell-laptop: Fix errors on failure and exit paths
dell-laptop: Fix build error by making buffer_mutex static
asus-laptop: fix style problems reported by checkpath.pl
asus-laptop: use device_create_file() instead of platform_group
asus-laptop: clean led code
asus-laptop: add gps rfkill
asus-laptop: set initial lcd state
asus-laptop: leds, remove dead code and fix asus_led_exit()/asus_led_init()
asus-laptop: add backlight changes notifications
asus-laptop: add bluetooth keys found on M9V
asus-laptop: switch to sparse keymap library
asus-laptop: rename wireless_status to wlan_status to avoid confusion
asus-laptop: add error check for write_acpi_int calls
asus-laptop: stop using ASUS_HANDLE and use relative methods instead
asus-laptop: rename function talking directly to acpi with asus_xxx scheme
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 34f52a14e051..c6591bca646b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6097,6 +6097,7 @@ F: arch/x86/ | |||
| 6097 | X86 PLATFORM DRIVERS | 6097 | X86 PLATFORM DRIVERS |
| 6098 | M: Matthew Garrett <mjg@redhat.com> | 6098 | M: Matthew Garrett <mjg@redhat.com> |
| 6099 | L: platform-driver-x86@vger.kernel.org | 6099 | L: platform-driver-x86@vger.kernel.org |
| 6100 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git | ||
| 6100 | S: Maintained | 6101 | S: Maintained |
| 6101 | F: drivers/platform/x86 | 6102 | F: drivers/platform/x86 |
| 6102 | 6103 | ||