git » linux-kernel » commit 7f31437

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

author Linus Torvalds
2009-10-09 20:30:50 UTC
committer Linus Torvalds
2009-10-09 20:30:50 UTC
parent 15d031c394e7bef9da4ec764e6b0330d701a0126
parent 4047df09a1581284218cb378208a87eaa36f2d2c
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:
  TPM: fix pcrread