diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-01-22 13:22:23 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-01-22 13:22:23 +1100 |
| commit | 9d5a5f65fcabb876cb0092901d56627bd5cbfc44 (patch) | |
| tree | 475a0e28bd239d0f766e06f6bac669dfe662a42b /drivers/char/tpm | |
| parent | 743410a03bbf110da8942a715cf1358344ecc281 (diff) | |
| parent | 6d1cff2a885850b78b40c34777b46cf5da5d1050 (diff) | |
Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into next
Diffstat (limited to 'drivers/char/tpm')
0 files changed, 0 insertions, 0 deletions