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) | |
| download | blackbird-op-linux-47bf31adc541bef0c20de15e800e0011f1ae70c7.tar.gz blackbird-op-linux-47bf31adc541bef0c20de15e800e0011f1ae70c7.zip | |
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 S: Maintained DOCKING STATION DRIVER -P: Kristen Carlson Accardi -M: kristen.c.accardi@intel.com +P: Shaohua Li +M: shaohua.li@intel.com L: linux-acpi@vger.kernel.org S: Supported |
