tree 013bf0394f8f9e6005e5378f2240a229a46c3825
parent 007a93a1bac9a7c8a936204d0c063faa824942f3
parent fbaa58696cef848de818768783ef185bd3f05158
author Linus Torvalds <torvalds@linux-foundation.org> 1242783801 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242783801 -0700

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: get_event_name stack corruption