Merge branch 'for-linus' of git://twin.jikos.cz/jikos/hid