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

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

Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)

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

Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/platform/x86/apple-gmux.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 06:38:05 +0000 (16:38 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/apple-gmux.c	patch \|	diff1 \|	diff2 \|	blob \| history