Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus