diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:04:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 00:04:23 -0400 |
| commit | 7fbd15f9b42f2c30ceeb94776a111d0c28669e0c (patch) | |
| tree | a196404c795091aae4254c9d479dce1c0653e4c5 /net/key | |
| 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
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions