diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 07:53:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-01 07:53:19 -0400 |
| commit | b3b2b6351a3f3342e6669b5c2defc85f6af75ee3 (patch) | |
| tree | 9b47ae7b0111ab024d719214d2745b128db48beb /fs/omfs | |
| parent | 90ae83f7fc32733e5829d806306c0c590f1a383f (diff) | |
| parent | 395bc5121828e570bd4bb6455c82b80e2f2b05b4 (diff) | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* '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.
Diffstat (limited to 'fs/omfs')
0 files changed, 0 insertions, 0 deletions