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)
commitf02f465b1cdcdf7485f89ec019e6cceaf80cadd5
tree4219772e39848f31b9554786de5a18c026dfe2e5
parentb6202832b43abb56b90ba8d68e2b9fc53c442fa6
parent747479a3fb42849fe73b9b1f7545d751bde7d632
Merge branch 'dock' into release

Conflicts:
drivers/acpi/dock.c

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