diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
| commit | 7e31842441776b4d6ec7fd916c91663ad05b7814 (patch) | |
| tree | 8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /MAINTAINERS | |
| parent | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff) | |
| parent | b1d248d96c71665c79befb81207f38f894c7c082 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f2a2b8e647c5..2a3163e527fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -241,21 +241,6 @@ F: drivers/pnp/pnpacpi/ | |||
| 241 | F: include/linux/acpi.h | 241 | F: include/linux/acpi.h |
| 242 | F: include/acpi/ | 242 | F: include/acpi/ |
| 243 | 243 | ||
| 244 | ACPI BATTERY DRIVERS | ||
| 245 | M: Alexey Starikovskiy <astarikovskiy@suse.de> | ||
| 246 | L: linux-acpi@vger.kernel.org | ||
| 247 | W: http://www.lesswatts.org/projects/acpi/ | ||
| 248 | S: Supported | ||
| 249 | F: drivers/acpi/battery.c | ||
| 250 | F: drivers/acpi/*sbs* | ||
| 251 | |||
| 252 | ACPI EC DRIVER | ||
| 253 | M: Alexey Starikovskiy <astarikovskiy@suse.de> | ||
| 254 | L: linux-acpi@vger.kernel.org | ||
| 255 | W: http://www.lesswatts.org/projects/acpi/ | ||
| 256 | S: Supported | ||
| 257 | F: drivers/acpi/ec.c | ||
| 258 | |||
| 259 | ACPI FAN DRIVER | 244 | ACPI FAN DRIVER |
| 260 | M: Zhang Rui <rui.zhang@intel.com> | 245 | M: Zhang Rui <rui.zhang@intel.com> |
| 261 | L: linux-acpi@vger.kernel.org | 246 | L: linux-acpi@vger.kernel.org |