projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77f312a 024e6cb)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 02:41:47 +0000 (19:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 02:41:47 +0000 (19:41 -0700)
* '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.


Trivial merge
John Crispins staging tree