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

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  selinux: Delete mls_copy_context