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