Merge branch 'for-linus' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Nov 2010 11:53:19 +0000 (07:53 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Nov 2010 11:53:19 +0000 (07:53 -0400)
commitb3b2b6351a3f3342e6669b5c2defc85f6af75ee3
tree9b47ae7b0111ab024d719214d2745b128db48beb
parent90ae83f7fc32733e5829d806306c0c590f1a383f
parent395bc5121828e570bd4bb6455c82b80e2f2b05b4
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.
MAINTAINERS