From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Sep 2011 17:28:52 +0000 (-0700)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.1-rc7~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2838888f3f268344d42ac088c8abcff91c505ced;p=pandora-kernel.git

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

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: Fix broken sec=ntlmv2/i sec option (try #2)
  Fix the conflict between rwpidforward and rw mount options
  CIFS: Fix ERR_PTR dereference in cifs_get_root
  cifs: fix possible memory corruption in CIFSFindNext
---

2838888f3f268344d42ac088c8abcff91c505ced
Reading git-diff-tree failed