Merge branch 'for-james' of git://github.com/srajiv/tpm into next