tree 9b47ae7b0111ab024d719214d2745b128db48beb
parent 90ae83f7fc32733e5829d806306c0c590f1a383f
parent 395bc5121828e570bd4bb6455c82b80e2f2b05b4
author Linus Torvalds <torvalds@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.