Skip to content

Commit

Permalink
Merge branch 'dock' into release
Browse files Browse the repository at this point in the history 
Conflicts:
	drivers/acpi/dock.c

Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Len Brown committed Dec 16, 2009
2 parents b620283 + 747479a commit f02f465
Showing 1 changed file with 91 additions and 170 deletions.
Loading

0 comments on commit f02f465

Please sign in to comment.