diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 00:55:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 00:55:37 -0400 |
| commit | e70da5634835ecd8abb68d14cfc27384d01dd201 (patch) | |
| tree | 97905add436c2ffdb83c60e87e4e85075813cabd /drivers/scsi/pcmcia | |
| parent | 644b55ce889edd37d6406df26e2d96d7a7390749 (diff) | |
| parent | 4ac212ad4e8fafc22fa147fc255ff5fa5435cf33 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/scsi/pcmcia')
0 files changed, 0 insertions, 0 deletions