| commit | e9c0f1529c9022afbab16a442382aa9a84a79c41 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 28 09:58:38 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 28 09:58:38 2012 -0700 |
| tree | 173e99d46283f5d814bf4407728ad0d2ea702100 | |
| parent | b18dafc86bb879d2f38a1743985d7ceb283c2f4d [diff] | |
| parent | 5bdad93387c64f0095df7ae9a252ff44234a8b3f [diff] |
Merge tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs Pull 9p changes for the 3.4 merge window from Eric Van Hensbergen. * tag 'for-linus-3.4-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: statfs should not override server f_type net/9p: handle flushed Tclunk/Tremove net/9p: don't allow Tflush to be interrupted