]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbd94e79b8b8b6596189db02366d631213a7efa36
tree4219772e39848f31b9554786de5a18c026dfe2e5
parentbcfe84b7638628cec2b78c2ee2c0fc8f381fd826
parent3e7ebb1680618ff3bb3c731c94ff73ac402f3e3a
Merge branch 'dock' into release

Conflicts:
drivers/acpi/dock.c

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