diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 19:13:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 19:13:06 -0700 |
| commit | e6f901bb85bc0707aaafb3c123c3013c0feaba7d (patch) | |
| tree | 8b039ab90baa6f96e7eed664afb7c8b166baff84 /fs/nfsd | |
| parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
| parent | e950598d43dce8d97e7d5270808393425d1e5cbd (diff) | |
| download | linux-e6f901bb85bc0707aaafb3c123c3013c0feaba7d.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
ima: always maintain counters
AppArmor: Fix locking from removal of profile namespace
AppArmor: Fix splitting an fqname into separate namespace and profile names
AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes
AppArmor: Drop hack to remove appended " (deleted)" string
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions