Skip to content
Snippets Groups Projects
Commit 057316cc authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'linus' into test 


Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 3e2dab9a 2515ddc6
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 215 additions and 1737 deletions
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