]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:31:55 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:31:55 +0000 (11:31 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6:
  capabilities: remain source compatible with 32-bit raw legacy capability support.
  LSM: remove stale web site from MAINTAINERS

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge