diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 17:51:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 17:51:27 -0700 |
| commit | 7de8e5737df31a6826015a65135ed8f0a32bb2c4 (patch) | |
| tree | b2d2f1bfc200c3209cecd2be1d3039179b1b14a0 /net | |
| parent | b5b4bc32b68d711f8b79a1d60e35892d761417c7 (diff) | |
| parent | 85cd6da53a8073d3f4503f56e4ea6cddccbb1c7f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
selinux: Fix regression for Xorg
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions