Merge remote-tracking branch 'input-current/for-linus'

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

Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)

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

Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/uapi/linux/Kbuild
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history