Merge remote-tracking branch 'input-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 22:59:41 +0000 (09:59 +1100)
1  2 
MAINTAINERS
include/uapi/linux/Kbuild

diff --cc MAINTAINERS
Simple merge
Simple merge