Merge branch 'for-linus' of git://github.com/dtor/input