Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:38:46 +0000 (08:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:38:46 +0000 (08:38 -0700)

Trivial merge