From: James Morris <james.l.morris@oracle.com>
Date: Wed, 15 Jul 2015 11:46:59 +0000 (+1000)
Subject: Merge tag 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmdd into... 
X-Git-Tag: v4.2-rc3~25^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=91ef5ccd54a2f22b2593bb6e8c97fc26c74b7f30;p=linux-2.6-block.git

Merge tag 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmdd into for-linus
---

91ef5ccd54a2f22b2593bb6e8c97fc26c74b7f30