diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 19:11:08 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 19:11:08 +0100 |
commit | ceb804cd0f63b0e0a87b81913b66add6de03043d (patch) | |
tree | 179d3050a8ea5fe5b8406efec64b5c391499d4d4 /arch/s390/include/asm/poll.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
parent | 9p: Skip check for mandatory locks when unlocking (diff) | |
download | linux-ceb804cd0f63b0e0a87b81913b66add6de03043d.tar.xz linux-ceb804cd0f63b0e0a87b81913b66add6de03043d.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: Skip check for mandatory locks when unlocking
9p: Fixes a simple bug enabling writes beyond 2GB.
9p: Change the name of new protocol from 9p2010.L to 9p2000.L
fs/9p: re-init the wstat in readdir loop
net/9p: Add sysfs mount_tag file for virtio 9P device
net/9p: Use the tag name in the config space for identifying mount point
Diffstat (limited to 'arch/s390/include/asm/poll.h')
0 files changed, 0 insertions, 0 deletions