Merge https://github.com/PeterHuewe/linux-tpmdd into for-linus
authorJames Morris <james.l.morris@oracle.com>
Mon, 16 Feb 2015 02:41:46 +0000 (13:41 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 16 Feb 2015 02:41:46 +0000 (13:41 +1100)

Trivial merge