Merge tag 'v4.16-rc6' into next-general
authorJames Morris <james.morris@microsoft.com>
Thu, 22 Mar 2018 21:26:16 +0000 (08:26 +1100)
committerJames Morris <james.morris@microsoft.com>
Thu, 22 Mar 2018 21:26:16 +0000 (08:26 +1100)
commit5893ed18a26d1f56b97c0290b0cbbc2d49d6de28
tree97aa931519fca28a0a12fad7485347198f8267cc
parent7bd698b3c04e61ee9e03d4c2a55003f75df14dca
parentc698ca5278934c0ae32297a8725ced2e27585d7f
Merge tag 'v4.16-rc6' into next-general

Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.