]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Aug 2008 03:49:37 +0000 (20:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Aug 2008 03:49:37 +0000 (20:49 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  CRED: Introduce credential access wrappers


Trivial merge