| commit | ade24c93ab173b392a905ef8d510874dfb05a417 | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Mon Jan 07 12:11:37 2013 +1100 |
| committer | James Morris <james.l.morris@oracle.com> | Mon Jan 07 12:11:37 2013 +1100 |
| tree | f984a9b428cdf1866566cf9dba808d8fcc60d468 | |
| parent | 5f243b9b46a22e5790dbbc36f574c2417af49a41 [diff] | |
| parent | a7f2a366f62319dfebf8d4dfe8b211f631c78457 [diff] |
Merge branch 'for-Linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus Pulled from Mimi's tree.