Merge remote-tracking branch 'drivers-x86/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 5 Nov 2015 03:21:15 +0000 (14:21 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 5 Nov 2015 03:21:15 +0000 (14:21 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:21:15 +0000 (14:21 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 03:21:15 +0000 (14:21 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/platform/x86/Kconfig
Simple merge
diff --cc drivers/platform/x86/asus-wmi.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 5 Nov 2015 03:21:15 +0000 (14:21 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 5 Nov 2015 03:21:15 +0000 (14:21 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/asus-wmi.c	patch \|	diff1 \|	diff2 \|	blob \| history