Merge tag 'cris-for-linus' of git://jni.nu/cris