From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 May 2016 02:16:12 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v4.7-rc1~98
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b99a9e8776ca837344c6b64d518483fc5d5eefb4;p=users%2Fjedix%2Flinux-maple.git

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

Pull cifs fixes from Steve French:
 "Two small cifs fixes, including one spnego upcall cifs security fix
  for stable"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Remove some obsolete comments
  cifs: Create dedicated keyring for spnego operations
---

b99a9e8776ca837344c6b64d518483fc5d5eefb4