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)
* '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.

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge