From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Nov 2010 18:34:48 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6614b7bb405a9b35dd28baea989a749492c46b2;p=linux-beck.git

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

f6614b7bb405a9b35dd28baea989a749492c46b2