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)
commita2218cac0aacecbecebd3cabc43cc8a4a09cecbb
tree70bc7d07d3af54f125c28154684c1394a1a6bd66
parenta44fe13eab664ac488ced0845d9885b019bd24c5
parent411b67b4b6a4dd1e0292a6a58dd753978179d173
Merge /pub/scm/linux/kernel/git/chrisw/lsm-2.6