Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2011 01:00:09 +0000 (18:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 May 2011 01:00:09 +0000 (18:00 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  net/9p/protocol.c: Fix a memory leak


Trivial merge