diff options
| author | Linus Torvalds | 2010-11-09 10:34:48 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2010-11-09 10:34:48 -0800 |
| commit | f6614b7bb405a9b35dd28baea989a749492c46b2 (patch) | |
| tree | 3a6bc580d98fb191ff44a374b61a3a55641f94ac /security/apparmor | |
| parent | 63bfd7384b119409685a17d5c58f0b56e5dc03da (diff) | |
| parent | 3565bd46b1c6a3dbf1f670d3275aa4018a4c65ae (diff) | |
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
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions