| commit | 2b828925652340277a889cbc11b2d0637f7cdaf7 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Fri Nov 14 11:29:12 2008 +1100 |
| committer | James Morris <jmorris@namei.org> | Fri Nov 14 11:29:12 2008 +1100 |
| tree | 32fcb3d3e466fc419fad2d3717956a5b5ad3d35a | |
| parent | 3a3b7ce9336952ea7b9564d976d068a238976c9d [diff] | |
| parent | 58e20d8d344b0ee083febb18c2b021d2427e56ca [diff] |
Merge branch 'master' into next Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>