Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
Linus Torvalds 20 years ago a2218cac a44fe13e