From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Mar 2010 18:11:08 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~22473
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ceb804cd0f63b0e0a87b81913b66add6de03043d;p=mirror_ubuntu-artful-kernel.git

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
---

ceb804cd0f63b0e0a87b81913b66add6de03043d