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)
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.


Trivial merge