diff options
author | James Morris <jmorris@namei.org> | 2011-11-18 11:17:23 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-11-18 11:17:23 +1100 |
commit | b85c804d5ad48f239871b95afbddd84422e06f25 (patch) | |
tree | b78af4d780dc7eec0c7b866194385150e6b29500 /COPYING | |
parent | fe8a0df46e5076429872887b467c538bc9c0c738 (diff) | |
parent | 9c69898783a0121399ec078d40d4ccc00e3cb0df (diff) | |
download | linux-b85c804d5ad48f239871b95afbddd84422e06f25.tar.gz linux-b85c804d5ad48f239871b95afbddd84422e06f25.tar.bz2 linux-b85c804d5ad48f239871b95afbddd84422e06f25.zip |
Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions