projects / profile / ivi / kernel-adaptation-intel-automotive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7670c70 14211d0)
Merge branch 'for-linus' of git://github.com/ericvh/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 12:20:53 +0000 (14:20 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 12:20:53 +0000 (14:20 +0200)
* '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


Trivial merge
Domain: System / Uncategorized;