Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Oct 2009 20:30:50 +0000 (13:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Oct 2009 20:30:50 +0000 (13:30 -0700)
commit7f3143702cc0d433c183d7b361b1316f2dcf8464
tree8454228d61b73d3a57c0717e667e2d94e692d04f
parent4047df09a1581284218cb378208a87eaa36f2d2c
parent15d031c394e7bef9da4ec764e6b0330d701a0126
Merge branch 'for-linus' of git://git./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