diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-24 01:19:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-24 01:19:00 -0500 |
| commit | fcb11235d3910c39afece52f6e106a9ca565d34b (patch) | |
| tree | 07412f9c367f5f9bf6ad7ccd6fa8146c4aba68af /MAINTAINERS | |
| parent | 78a5331dddcffabadef024ccc051f7a519b13238 (diff) | |
| parent | 44ef00e6482e755f36629773abc2aee83a6f53e3 (diff) | |
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cf3f412dd6f9..66f5f7dab285 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3652,6 +3652,11 @@ W: http://0pointer.de/lennart/tchibo.html | |||
| 3652 | S: Maintained | 3652 | S: Maintained |
| 3653 | F: drivers/platform/x86/msi-laptop.c | 3653 | F: drivers/platform/x86/msi-laptop.c |
| 3654 | 3654 | ||
| 3655 | MSI WMI SUPPORT | ||
| 3656 | M: Anisse Astier <anisse@astier.eu> | ||
| 3657 | S: Supported | ||
| 3658 | F: drivers/platform/x86/msi-wmi.c | ||
| 3659 | |||
| 3655 | MULTIFUNCTION DEVICES (MFD) | 3660 | MULTIFUNCTION DEVICES (MFD) |
| 3656 | M: Samuel Ortiz <sameo@linux.intel.com> | 3661 | M: Samuel Ortiz <sameo@linux.intel.com> |
| 3657 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git | 3662 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git |