Merge tag 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmdd into...
authorJames Morris <james.l.morris@oracle.com>
Wed, 15 Jul 2015 11:46:59 +0000 (21:46 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 15 Jul 2015 11:46:59 +0000 (21:46 +1000)

Trivial merge