Merge branch 'for-current' of https://github.com/PeterHuewe/linux-tpmdd into for...
authorJames Morris <james.l.morris@oracle.com>
Mon, 9 Mar 2015 13:38:16 +0000 (00:38 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 9 Mar 2015 13:38:16 +0000 (00:38 +1100)

Trivial merge