diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 18:21:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 18:21:56 +0200 |
commit | 2a651c7f8d377cf88271374315cbb5fe82eac784 (patch) | |
tree | 00bef7fdd1541d0a96d36410630280dfba24f8b5 /Makefile | |
parent | Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | 9p: update Documentation pointers (diff) | |
download | linux-2a651c7f8d377cf88271374315cbb5fe82eac784.tar.xz linux-2a651c7f8d377cf88271374315cbb5fe82eac784.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: update Documentation pointers
net/9p: enable 9p to work in non-default network namespace
net/9p: p9_idpool_get return -1 on error
fs/9p: Don't clunk dentry fid when we fail to get a writeback inode
9p: Small cleanup in <net/9p/9p.h>
9p: remove experimental tag from tested configurations
9p: typo fixes and minor cleanups
net/9p: Change linuxdoc names to match functions.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions