Skip to content
GitLab
Commit 95ee46aa authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'linus' into release 



Conflicts:
	drivers/acpi/debug.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents cfa806f0 92fa5bd9
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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