Merge branches 'device-properties' and 'acpi-misc'

author Rafael J. Wysocki <[email protected]>

Fri, 14 Oct 2016 12:09:57 +0000 (14:09 +0200)

committer Rafael J. Wysocki <[email protected]>

Fri, 14 Oct 2016 12:09:57 +0000 (14:09 +0200)
author Rafael J. Wysocki <[email protected]>
Fri, 14 Oct 2016 12:09:57 +0000 (14:09 +0200)
committer Rafael J. Wysocki <[email protected]>
Fri, 14 Oct 2016 12:09:57 +0000 (14:09 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/acpi.h
Simple merge
author	Rafael J. Wysocki <[email protected]>
	Fri, 14 Oct 2016 12:09:57 +0000 (14:09 +0200)
committer	Rafael J. Wysocki <[email protected]>
	Fri, 14 Oct 2016 12:09:57 +0000 (14:09 +0200)
		1	2	3
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/acpi.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history