diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 19:10:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 19:10:33 -0400 |
commit | 91e67a996c60a347ad7b918a74efb0f6b3b274c3 (patch) | |
tree | 05fd872079b1199d112cc7508faf81b8490dd83f /MAINTAINERS | |
parent | 1eb63378354ac37b7e27d256bbf84684751bac32 (diff) | |
parent | 1d1fc8a75fec3a2b29cc5864d45c5d03048f62e0 (diff) |
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (45 commits)
acer-wmi: replaced the hard coded bitmap by the communication devices bitmap from SMBIOS
acer-wmi: check the existence of internal wireless device when set capability
acer-wmi: add ACER_WMID_v2 interface flag to represent new notebooks
sony-laptop:irq: Remove IRQF_DISABLED
asus-laptop: Add rfkill support for Pegatron Lucid tablet
asus-laptop: pega_accel - Report accelerometer orientation change through udev
asus-laptop: fix module description
asus-laptop: hide leds on Pegatron Lucid
asus-laptop: Pegatron Lucid accelerometer
asus-laptop: allow boot time control of Pegatron ALS sensor
Platform: samsung_laptop: add support for X520 machines.
platform: samsung_laptop: add dmi information for Samsung R700 laptops
hp_accel: Add axis-mapping for HP ProBook / EliteBook
hp_accel: Add a new PNP id
WMI: properly cleanup devices to avoid crashes
ideapad: remove sysfs node for cfg
ideapad: add debugfs support
ideapad: add event for Novo key
ideapad: change parameter of ideapad_sync_rfk_state
ideapad: define vpc commands
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5e587fcaf4dc..d498c70e394a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3227,6 +3227,13 @@ F: Documentation/ide/ | |||
3227 | F: drivers/ide/ | 3227 | F: drivers/ide/ |
3228 | F: include/linux/ide.h | 3228 | F: include/linux/ide.h |
3229 | 3229 | ||
3230 | IDEAPAD LAPTOP EXTRAS DRIVER | ||
3231 | M: Ike Panhc <ike.pan@canonical.com> | ||
3232 | L: platform-driver-x86@vger.kernel.org | ||
3233 | W: http://launchpad.net/ideapad-laptop | ||
3234 | S: Maintained | ||
3235 | F: drivers/platform/x86/ideapad-laptop.c | ||
3236 | |||
3230 | IDE/ATAPI DRIVERS | 3237 | IDE/ATAPI DRIVERS |
3231 | M: Borislav Petkov <petkovbb@gmail.com> | 3238 | M: Borislav Petkov <petkovbb@gmail.com> |
3232 | L: linux-ide@vger.kernel.org | 3239 | L: linux-ide@vger.kernel.org |