Merge branch 'for-james' of git://github.com/srajiv/tpm into next
authorJames Morris <jmorris@namei.org>
Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
committerJames Morris <jmorris@namei.org>
Wed, 16 Nov 2011 23:08:37 +0000 (10:08 +1100)
commit8077e8b059232f23fe51fdc42868dcd8ba293549
tree86eea03f30cd64a3da57245a61d5a3a04fdb2308
parent7845bc3964756240863ae453ffe4f7ee27ddc954
parentb9e3238aa36db33aa0d0bd44ef85297c45627aac
Merge branch 'for-james' of git://github.com/srajiv/tpm into next
drivers/char/tpm/Kconfig
drivers/char/tpm/tpm.c