tree 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5
parent a776878d6cf8a81fa65b29aa9bd6a10a5131e71c
parent 7023676f9ee851d94f0942e879243fc1f9081c47
author Linus Torvalds <torvalds@linux-foundation.org> 1323470744 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323470744 -0800

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