Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 14:55:42 +0000 (07:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 May 2010 14:55:42 +0000 (07:55 -0700)
commit3ac4e829bd8575e9adea2ba1b9329da363881ffb
tree1c11ad83f9153db87e1c4d4fb4076e410fb0ae63
parent7ac992ef615c66a05ebb831915935e83c0ec8e05
parent4ae69e6b718589abe97c9625ccbb1e0bc95a8c0e
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:
  mmap_min_addr check CAP_SYS_RAWIO only for write