| commit | 8077e8b059232f23fe51fdc42868dcd8ba293549 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Thu Nov 17 10:08:37 2011 +1100 |
| committer | James Morris <jmorris@namei.org> | Thu Nov 17 10:08:37 2011 +1100 |
| tree | 86eea03f30cd64a3da57245a61d5a3a04fdb2308 | |
| parent | 7845bc3964756240863ae453ffe4f7ee27ddc954 [diff] | |
| parent | b9e3238aa36db33aa0d0bd44ef85297c45627aac [diff] |
Merge branch 'for-james' of git://github.com/srajiv/tpm into next