diff options
| author | Linus Torvalds | 2011-09-07 07:48:00 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-09-07 07:48:00 -0700 |
| commit | 28c51ee3da3be98a3d7ce54250ec0b4d99826bb7 (patch) | |
| tree | 8b7bc6db522e83db85bbb78a81226207deb3b043 /fs/ecryptfs/main.c | |
| parent | 115452675361dbef2dfb59f4cbd922637be3dc5b (diff) | |
| parent | 51b8b4fb32271d39fbdd760397406177b2b0fd36 (diff) | |
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
Diffstat (limited to 'fs/ecryptfs/main.c')
0 files changed, 0 insertions, 0 deletions