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