]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2017 20:36:39 +0000 (12:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2017 20:36:39 +0000 (12:36 -0800)
Pull cifs fix from Steve French:
 "A small cifs fix for stable"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: initialize file_info_lock


Trivial merge