Merge tag 'tpmdd-next-20151110' of https://github.com/jsakkine/linux-tpmdd into for...
authorJames Morris <james.l.morris@oracle.com>
Thu, 12 Nov 2015 09:38:04 +0000 (20:38 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 12 Nov 2015 09:38:04 +0000 (20:38 +1100)

Trivial merge