Merge branch 'dock' into release

Conflicts: drivers/acpi/dock.c Signed-off-by: Len Brown <len.brown@intel.com>

Merge branch 'dock' into release
Conflicts: drivers/acpi/dock.c Signed-off-by: Len Brown <len.brown@intel.com>
f02f465b · Len Brown · b6202832 · 747479a3 · f02f465b
Commit f02f465b authored Dec 16, 2009 by Len Brown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 91 additions and 170 deletions

drivers/acpi/dock.c drivers/acpi/dock.c +91 -170

No files found.
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c