From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Mar 2010 21:25:24 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b13d3c6e8ab6ac53e8c1858a9c837cb6ba3bbef0;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: Add hardlink support to .u extension
  9P2010.L handshake: .L protocol negotiation
  9P2010.L handshake: Remove "dotu" variable
  9P2010.L handshake: Add mount option
  9P2010.L handshake: Add VFS flags
  net/9p: Handle mount errors correctly.
  net/9p: Remove MAX_9P_CHAN limit
  net/9p: Add multi channel support.
---

b13d3c6e8ab6ac53e8c1858a9c837cb6ba3bbef0