Merge branch 'dock' into release
authorLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 08:33:28 +0000 (03:33 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 08:33:28 +0000 (03:33 -0500)
Conflicts:
drivers/acpi/dock.c

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge