diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-27 07:43:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-27 07:43:56 +0100 |
| commit | 69e4d4c3e1cb23fce81deeae08b502d27bad6993 (patch) | |
| tree | 18a9bb34e46027efbb8c0a6c149335c66f9b9012 /drivers/s390/block/dasd_diag.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff) | |
| parent | selinux: fix labeling of /proc/net inodes (diff) | |
| download | linux-69e4d4c3e1cb23fce81deeae08b502d27bad6993.tar.xz linux-69e4d4c3e1cb23fce81deeae08b502d27bad6993.zip | |
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: fix labeling of /proc/net inodes
Diffstat (limited to 'drivers/s390/block/dasd_diag.c')
0 files changed, 0 insertions, 0 deletions