tree 28903879a8570eaefa57942ec3d475d365f5a465
parent 4538fad56ee1c16bce0294b5647d2551f0e03164
parent 0a918a9432cc30aede10f904253b66ea6ab485ac
author Len Brown <len.brown@intel.com> 1224732326 -0400
committer Len Brown <len.brown@intel.com> 1224732326 -0400

Merge branch 'dock' into test

Conflicts:
	drivers/acpi/osl.c

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