| commit | e36d5058dbf85aacf2fadf508f275afd37c58576 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 18 07:14:30 2011 -0200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 18 07:14:30 2011 -0200 |
| tree | 35f2525f2666b272028ed0e956d43d547581eeb6 | |
| parent | a9098b372606a15745cdeb012de4ee91c0df82c4 [diff] | |
| parent | b85c804d5ad48f239871b95afbddd84422e06f25 [diff] |
Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security * 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security: encrypted-keys: module build fixes encrypted-keys: fix error return code Smack: smackfs cipso seq read repair