projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ac992e 4ae69e6)
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)
* '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


Trivial merge
John Crispins staging tree