Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selin...
authorLinus Torvalds <torvalds@woody.osdl.org>
Mon, 8 Jan 2007 23:08:22 +0000 (15:08 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Mon, 8 Jan 2007 23:08:22 +0000 (15:08 -0800)
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  selinux: Delete mls_copy_context


Trivial merge