Merge branch 'for-linus' of git://repo.or.cz/cris-mirror