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)
commit415f9b71d17d294c2f2075b3fc7717d72e5e48f9
tree2baf33529d5de478b2501b7fa155d4cc95d35627
parentf9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b
parent81ddd8c0c5e1cb41184d66567140cb48c53eb3d1
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

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