Skip to content
Commit f02f465b authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'dock' into release 



Conflicts:
	drivers/acpi/dock.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents b6202832 747479a3
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment