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