| commit | c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 5 Aug 2010 21:26:19 +0000 (5 14:26 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 5 Aug 2010 21:26:19 +0000 (5 14:26 -0700) | ||
| tree | a52f8e38956ddaa64a5371993d509875fbe5d726 | treesnapshot (tar.gz zip) |
| parent | f43100ae39bfeb757b75835ef61f0c2c46c99348 | commitdiff |
| parent | 06c22dadc6d3f9b65e55407a87faaf6a4a014112 | commitdiff |
Merge branch 'for-linus' of git://git./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:
apparmor: depends on NET
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
apparmor: depends on NET