From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 13 Sep 2005 16:48:54 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
X-Git-Tag: v2.6.14-rc2~48
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddbf9ef385bfbef897210733abfb73cb9b94ecec;p=linux-2.6

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

ddbf9ef385bfbef897210733abfb73cb9b94ecec