]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1154526 51b8b4f)
Merge branch 'for-linus' of git://github.com/ericvh/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 14:48:00 +0000 (07:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 14:48:00 +0000 (07:48 -0700)
* 'for-linus' of git://github.com/ericvh/linux:
  fs/9p: Use protocol-defined value for lock/getlock 'type' field.
  fs/9p: Always ask new inode in lookup for cache mode disabled
  fs/9p: Add OS dependent open flags in 9p protocol
  net/9p: Fix kernel crash with msize 512K
  fs/9p: Don't update file type when updating file attributes
  fs/9p: Add fid before dentry instantiation


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG