alds@linux-foundation.org> 1288612399 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1288612399 -0400

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

* 'for-linus' of git://www.jni.nu/cris:
  CRIS: Add paths for CRISv10 serial driver
  CRIS: Fix RS485 delay handling.
  Add missing "struct" to in sizeof.
jš³™