Skip to content
Commit 7674416d authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'ull' into test 



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

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 0ca9413c 27663c58
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment