]> 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>
Sat, 7 Aug 2010 21:28:20 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 21:28:20 +0000 (14:28 -0700)
commitc175b321e44b26e639438753064cc17ea931e157
tree8834341f81dc570f9f255af57ac28041c317226a
parent4cf635eb7bbd8a25c3bcecb99336cda0e10c7377
parentec54a74a8e6b5ef59c15a15d56100274dadf2cb6
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:
  SELINUX: Fix build error.