diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 04:14:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 04:14:30 -0500 |
commit | e36d5058dbf85aacf2fadf508f275afd37c58576 (patch) | |
tree | 35f2525f2666b272028ed0e956d43d547581eeb6 /arch/powerpc/include/asm/reg_a2.h | |
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
Diffstat (limited to 'arch/powerpc/include/asm/reg_a2.h')
0 files changed, 0 insertions, 0 deletions