tree 0c775af89ad3a0a634ee64b7f470f722a1290462
parent cd7945397d4784318668fbbbfa99e4c6fcf30b3b
parent d5751469f210d2149cc2159ffff66cbeef6da3f2
author Linus Torvalds <torvalds@linux-foundation.org> 1331683433 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1331683433 -0700

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.