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