Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Mar 2012 00:03:53 +0000 (17:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Mar 2012 00:03:53 +0000 (17:03 -0700)
commit8e8bb96d247fc67eb66a2ebcc6fd45787b5a8b15
tree0c775af89ad3a0a634ee64b7f470f722a1290462
parentcd7945397d4784318668fbbbfa99e4c6fcf30b3b
parentd5751469f210d2149cc2159ffff66cbeef6da3f2
Merge git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Do not kmalloc under the flocks spinlock
  cifs: possible memory leak in xattr.