Merge branch 'pm-qos'

author Rafael J. Wysocki <[email protected]>

Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)

committer Rafael J. Wysocki <[email protected]>

Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)
author Rafael J. Wysocki <[email protected]>
Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)
committer Rafael J. Wysocki <[email protected]>
Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)
diff --cc drivers/base/power/domain.c
Simple merge
diff --cc include/linux/pm_qos.h
Simple merge
author	Rafael J. Wysocki <[email protected]>
	Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)
committer	Rafael J. Wysocki <[email protected]>
	Mon, 13 Nov 2017 00:33:48 +0000 (01:33 +0100)
		1	2
drivers/base/power/domain.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pm_qos.h	patch \|	diff1 \|	diff2 \|	blob \| history