| commit | 80a755545d54c8e9fd801f0de3d015defd825659 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 25 17:27:18 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 25 17:27:18 2015 -0800 |
| tree | 91005c6d92ef474f8f3ee22c9deb51cc5517ee87 | |
| parent | bfc835b5716fd86b568d4f9b15be04c4f361082b [diff] | |
| parent | fb32c76d16aa40f3057f53273ac483a8e2468004 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs fixes from Al Viro: "A couple of fixes - deadlock in CIFS and build breakage in cris serial driver (resurfaced f_dentry in there)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: VFS: Convert file->f_dentry->d_inode to file_inode() fix deadlock in cifs_ioctl_clone()