| commit | 153d8a122e04d285aaee0ba00af7564182b7b6de | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 08 10:21:10 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 08 10:21:10 2009 -0700 |
| tree | 6de586e234b4021464fd71930a7e7f60717c4430 | |
| parent | 2a50b2560ee956808da0b644cb529608dee65274 [diff] | |
| parent | 211a40c0870457b29100cffea0180fa5083caf96 [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: smack: fixes for unlabeled host support