diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
| commit | 47bf31adc541bef0c20de15e800e0011f1ae70c7 (patch) | |
| tree | 28903879a8570eaefa57942ec3d475d365f5a465 /MAINTAINERS | |
| parent | 4538fad56ee1c16bce0294b5647d2551f0e03164 (diff) | |
| parent | 0a918a9432cc30aede10f904253b66ea6ab485ac (diff) | |
Merge branch 'dock' into test
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8dae4555f10e..4b7d8f291cd4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1415,8 +1415,8 @@ M: rdunlap@xenotime.net | |||
| 1415 | S: Maintained | 1415 | S: Maintained |
| 1416 | 1416 | ||
| 1417 | DOCKING STATION DRIVER | 1417 | DOCKING STATION DRIVER |
| 1418 | P: Kristen Carlson Accardi | 1418 | P: Shaohua Li |
| 1419 | M: kristen.c.accardi@intel.com | 1419 | M: shaohua.li@intel.com |
| 1420 | L: linux-acpi@vger.kernel.org | 1420 | L: linux-acpi@vger.kernel.org |
| 1421 | S: Supported | 1421 | S: Supported |
| 1422 | 1422 | ||