| commit | c124891f50f11e33acdfa276864ea089bab726b6 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 19 Aug 2009 02:41:47 +0000 (18 19:41 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 19 Aug 2009 02:41:47 +0000 (18 19:41 -0700) | ||
| tree | c22a23cf8264e5d0b5b01c21ea0497f7bc1bb1ac | treesnapshot (tar.gz zip) |
| parent | 77f312a96dd1e01c49ccd872265e70a8346b53cc | commitdiff |
| parent | 024e6cb408307de41cbfcb1e5a170d9af60ab2a9 | commitdiff |
Merge branch 'for-linus' of git://git./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:
security: Fix prompt for LSM_MMAP_MIN_ADDR
security: Make LSM_MMAP_MIN_ADDR default match its help text.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
security: Fix prompt for LSM_MMAP_MIN_ADDR
security: Make LSM_MMAP_MIN_ADDR default match its help text.