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