commit | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 09 21:04:23 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 09 21:04:23 2010 -0700 |
tree | a196404c795091aae4254c9d479dce1c0653e4c5 | |
parent | 1989425a3aed215f1accd5d8019b18b345166a63 [diff] | |
parent | f1d23ed8218ca5afaf178a6495253dbb7fc98f57 [diff] |
Merge branch 'rs485fix' of git://www.jni.nu/cris * 'rs485fix' of git://www.jni.nu/cris: CRIS: ioctl for getting RS485 information