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)
commit7fbd15f9b42f2c30ceeb94776a111d0c28669e0c
treea196404c795091aae4254c9d479dce1c0653e4c5
parent1989425a3aed215f1accd5d8019b18b345166a63
parentf1d23ed8218ca5afaf178a6495253dbb7fc98f57
Merge branch 'rs485fix' of git://www.jni.nu/cris

* 'rs485fix' of git://www.jni.nu/cris:
  CRIS: ioctl for getting RS485 information