tree a52f8e38956ddaa64a5371993d509875fbe5d726
parent f43100ae39bfeb757b75835ef61f0c2c46c99348
parent 06c22dadc6d3f9b65e55407a87faaf6a4a014112
author Linus Torvalds <torvalds@linux-foundation.org> 1281043579 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281043579 -0700

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:
  apparmor: depends on NET