From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Oct 2011 12:20:53 +0000 (+0200)
Subject: Merge branch 'for-linus' of git://github.com/ericvh/linux
X-Git-Tag: v3.2-rc1~173
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=e33bae14fd8da449d735552d78e6dd33ece0458c

Merge branch 'for-linus' of git://github.com/ericvh/linux

* 'for-linus' of git://github.com/ericvh/linux:
  9p: fix 9p.txt to advertise msize instead of maxdata
  net/9p: Convert net/9p protocol dumps to tracepoints
  fs/9p: change an int to unsigned int
  fs/9p: Cleanup option parsing in 9p
  9p: move dereference after NULL check
  fs/9p: inode file operation is properly initialized init_special_inode
  fs/9p: Update zero-copy implementation in 9p
---

e33bae14fd8da449d735552d78e6dd33ece0458c