]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 21:26:19 +0000 (14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 21:26:19 +0000 (14:26 -0700)
commitc07e0374abc2c0c7d3f840feaf03d78b4ce34a47
treea52f8e38956ddaa64a5371993d509875fbe5d726
parent959ea8a87013f570c36ae18cceb5450fdeb7992f
parent028ed5bd8128e3bf8ea954897f0c32f25b61ec18
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