tree 1a4549823d7bdd892dc3b3b7b3fa9214216ac384
parent 0ca9413c234aa5a49ffaf80e46b50721a752e45a
parent 27663c5855b10af9ec67bc7dfba001426ba21222
author Len Brown <len.brown@intel.com> 1224732809 -0400
committer Len Brown <len.brown@intel.com> 1224732809 -0400

Merge branch 'ull' into test

Conflicts:
	drivers/acpi/bay.c
	drivers/acpi/dock.c
	drivers/ata/libata-acpi.c

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