tree 3a6bc580d98fb191ff44a374b61a3a55641f94ac
parent 63bfd7384b119409685a17d5c58f0b56e5dc03da
parent 3565bd46b1c6a3dbf1f670d3275aa4018a4c65ae
author Linus Torvalds <torvalds@linux-foundation.org> 1289327688 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289327688 -0800

Merge git://git.kernel.org/pub/scm/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