From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Dec 2011 22:45:44 +0000 (-0800)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: firefly_0821_release~3680^2~3963
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8def5f51b012efb00e77ba2d04696cc0aadd0609;p=firefly-linux-kernel-4.4.55.git

Merge git://git.samba.org/sfrench/cifs-2.6

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: check for NULL last_entry before calling cifs_save_resume_key
  cifs: attempt to freeze while looping on a receive attempt
  cifs: Fix sparse warning when calling cifs_strtoUCS
  CIFS: Add descriptions to the brlock cache functions
---

8def5f51b012efb00e77ba2d04696cc0aadd0609