apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dock' into test

Browse Source 
Conflicts:
	drivers/acpi/osl.c

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2008-10-22 23:25:26 -04:00
parent 4538fad56e 0a918a9432
commit 47bf31adc5
12 changed files with 424 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MAINTAINERS
+2 -2
View File
@@ -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