projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bfc835b fb32c76)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2015 01:27:18 +0000 (17:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2015 01:27:18 +0000 (17:27 -0800)
commit80a755545d54c8e9fd801f0de3d015defd825659
tree91005c6d92ef474f8f3ee22c9deb51cc5517ee87tree | snapshot
parentbfc835b5716fd86b568d4f9b15be04c4f361082bcommit | diff
parentfb32c76d16aa40f3057f53273ac483a8e2468004commit | diff
Merge branch 'for-linus' of git://git./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()
John Crispins staging tree