diff options
author | 2009-08-18 19:41:47 -0700 | |
---|---|---|
committer | 2009-08-18 19:41:47 -0700 | |
commit | c124891f50f11e33acdfa276864ea089bab726b6 (patch) | |
tree | c22a23cf8264e5d0b5b01c21ea0497f7bc1bb1ac /lib/dma-debug.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu (diff) | |
parent | security: Fix prompt for LSM_MMAP_MIN_ADDR (diff) | |
download | linux-rng-c124891f50f11e33acdfa276864ea089bab726b6.tar.xz linux-rng-c124891f50f11e33acdfa276864ea089bab726b6.zip |
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.
Diffstat (limited to 'lib/dma-debug.c')
0 files changed, 0 insertions, 0 deletions