diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-15 09:55:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-15 09:55:39 -0700 |
| commit | da1b001a2a2a9cb323e58327ed07ac4a5e6d96ea (patch) | |
| tree | b4d183c6a4bab6a2b53d9ac9f4501bcd46cb158b /fs/splice.c | |
| parent | df8d6fe9efba4ea4b46a5bdc229031c5bb880575 (diff) | |
| parent | 1836750115f20b774e55c032a3893e8c5bdf41ed (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
fix loop checks in d_materialise_unique()
Fix ->d_lock locking order in unlazy_walk()
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions