Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 01:43:21 +0000 (18:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 01:43:21 +0000 (18:43 -0700)
commit4fe1103201057e74f630b1cb8d8d49bd6ce0e666
tree013bf0394f8f9e6005e5378f2240a229a46c3825
parent007a93a1bac9a7c8a936204d0c063faa824942f3
parentfbaa58696cef848de818768783ef185bd3f05158
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: get_event_name stack corruption