Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2010 18:34:48 +0000 (10:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Nov 2010 18:34:48 +0000 (10:34 -0800)
commitf6614b7bb405a9b35dd28baea989a749492c46b2
tree3a6bc580d98fb191ff44a374b61a3a55641f94ac
parent63bfd7384b119409685a17d5c58f0b56e5dc03da
parent3565bd46b1c6a3dbf1f670d3275aa4018a4c65ae
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: fix a memleak in cifs_setattr_nounix()
  cifs: make cifs_ioctl handle NULL filp->private_data correctly