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:
security: Fix prompt for LSM_MMAP_MIN_ADDR
security: Make LSM_MMAP_MIN_ADDR default match its help text.

+2 -2
+2 -2
security/Kconfig
··· 114 114 If you are unsure how to answer this question, answer N. 115 115 116 116 config LSM_MMAP_MIN_ADDR 117 - int "Low address space for LSM to from user allocation" 117 + int "Low address space for LSM to protect from user allocation" 118 118 depends on SECURITY && SECURITY_SELINUX 119 - default 65535 119 + default 65536 120 120 help 121 121 This is the portion of low virtual memory which should be protected 122 122 from userspace allocation. Keeping a user from writing to low pages