From: Linus Torvalds Date: Tue, 26 Jul 2011 18:11:28 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1d87c28e680ce4ecb8c260d8ce070b8339d52abb;p=~shefty%2Frdma-dev.git Merge git://git.kernel.org/pub/scm/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 --- 1d87c28e680ce4ecb8c260d8ce070b8339d52abb