Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 18:11:28 +0000 (11:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 18:11:28 +0000 (11:11 -0700)
commit1d87c28e680ce4ecb8c260d8ce070b8339d52abb
tree84d145886c982d1193418bb9e43de774beb21d3b
parentaebdd82e18c38258fe84ea080a43c098e826ef63
parent14cae3243b555afda69a57778069ddca65532c06
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: Cleanup: check return codes of crypto api calls
  CIFS: Fix oops while mounting with prefixpath
  [CIFS] Redundant null check after dereference
  cifs: use cifs_dirent in cifs_save_resume_key
  cifs: use cifs_dirent to replace cifs_get_name_from_search_buf
  cifs: introduce cifs_dirent
  cifs: cleanup cifs_filldir
fs/cifs/dir.c
fs/cifs/readdir.c