Merge branch 'rs485fix' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 04:04:23 +0000 (21:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 04:04:23 +0000 (21:04 -0700)
* 'rs485fix' of git://www.jni.nu/cris:
  CRIS: ioctl for getting RS485 information


Trivial merge