Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm...