tree ef5cd02bb97d72d02538975620cdd668169558f0
parent d77e92e270edd79a2218ce0ba5b6179ad0c93175
parent 5fb4e288a025af1abc5c67ecebf30fbf6b3edad1
author Linus Torvalds <torvalds@linux-foundation.org> 1441817975 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1441817975 -0700

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs updates from Steve French:
 "Small cifs fix and a patch for improved debugging"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Fix use-after-free on mid_q_entry
  Update cifs version number
  Add way to query server fs info for smb3