| commit | e33bae14fd8da449d735552d78e6dd33ece0458c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 26 14:20:53 2011 +0200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 26 14:20:53 2011 +0200 |
| tree | 048c062c47f7bfdb0ea8ad19c5b5849a58ff3022 | |
| parent | 7670c7010c7b367ca40c3aba02afb36149764a6e [diff] | |
| parent | 14211d026dad4641d4dffd7a4c520bcaa8fd4a65 [diff] |
Merge branch 'for-linus' of git://github.com/ericvh/linux * 'for-linus' of git://github.com/ericvh/linux: 9p: fix 9p.txt to advertise msize instead of maxdata net/9p: Convert net/9p protocol dumps to tracepoints fs/9p: change an int to unsigned int fs/9p: Cleanup option parsing in 9p 9p: move dereference after NULL check fs/9p: inode file operation is properly initialized init_special_inode fs/9p: Update zero-copy implementation in 9p