Merge branch 'cris' of git://www.jni.nu/cris