Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge