Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 31 Aug 2007 04:55:37 +0000 (21:55 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 31 Aug 2007 04:55:37 +0000 (21:55 -0700)
commite70da5634835ecd8abb68d14cfc27384d01dd201
tree97905add436c2ffdb83c60e87e4e85075813cabd
parent644b55ce889edd37d6406df26e2d96d7a7390749
parent4ac212ad4e8fafc22fa147fc255ff5fa5435cf33
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: clear parent death signal on SID transitions