From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Aug 2010 21:26:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.36-rc1~544
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4;p=~emulex%2Finfiniband.git

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
---

c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4