| commit | efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 17 16:58:26 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 17 16:58:26 2009 -0800 |
| tree | cf7df8a837b719623e13b3ab19e8cfce1e270883 | |
| parent | b5c96f89177b460ef89ecd777d5f2fefd4534d3f [diff] | |
| parent | a00ae4d21b2fa9379914f270ffffd8d3bec55430 [diff] |
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:
Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support
NOMMU: Optimise away the {dac_,}mmap_min_addr tests
security/min_addr.c: make init_mmap_min_addr() static
keys: PTR_ERR return of wrong pointer in keyctl_get_security()