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

Merge branches 'release' and 'fluff' into release 



Conflicts:

	drivers/acpi/scan.c
	include/linux/acpi.h

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 299cfe38 299cfe38 9e527971
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment