]> rtime.felk.cvut.cz Git - linux-imx.git/commit
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)
commit28c51ee3da3be98a3d7ce54250ec0b4d99826bb7
tree8b7bc6db522e83db85bbb78a81226207deb3b043
parent115452675361dbef2dfb59f4cbd922637be3dc5b
parent51b8b4fb32271d39fbdd760397406177b2b0fd36
Merge branch 'for-linus' of git://github.com/ericvh/linux

* '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