tree 70bc7d07d3af54f125c28154684c1394a1a6bd66
parent a44fe13eab664ac488ced0845d9885b019bd24c5
parent 411b67b4b6a4dd1e0292a6a58dd753978179d173
author Linus Torvalds <torvalds@g5.osdl.org> 1128094726 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1128094726 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6