| commit | b85c804d5ad48f239871b95afbddd84422e06f25 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Fri Nov 18 11:17:23 2011 +1100 |
| committer | James Morris <jmorris@namei.org> | Fri Nov 18 11:17:23 2011 +1100 |
| tree | b78af4d780dc7eec0c7b866194385150e6b29500 | |
| parent | fe8a0df46e5076429872887b467c538bc9c0c738 [diff] | |
| parent | 9c69898783a0121399ec078d40d4ccc00e3cb0df [diff] |
Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus