]> err.no Git - linux-2.6/commit
Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 17:55:57 +0000 (10:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Aug 2008 17:55:57 +0000 (10:55 -0700)
commita7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287
treef031a4ae113e7669b56eb399c2e6f5285d2418f5
parentb14f7fb5aa2f4289e3a9fa8d7d92417ec8607498
parent383795c206946777d87ed5f6d61d6659110f9344
Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  SELinux: /proc/mounts should show what it can