| commit | cd816a0d84377c4e87f55cbe934a23417f9f5743 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 07 14:28:20 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 07 14:28:20 2010 -0700 |
| tree | 8834341f81dc570f9f255af57ac28041c317226a | |
| parent | 0d9f9e122c74583de15a86d1c660c08dc298f2c8 [diff] | |
| parent | a7a387cc596278af1516c534b50cc0bee171129d [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 build error.