diff options
| author | James Morris <[email protected]> | 2008-12-04 06:16:36 +0000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2008-12-04 06:16:36 +0000 |
| commit | ec98ce480ada787f2cfbd696980ff3564415505b (patch) | |
| tree | 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84 /security/selinux/hooks.c | |
| parent | Merge branch 'serge-next' into next (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | kernel-ec98ce480ada787f2cfbd696980ff3564415505b.tar.gz kernel-ec98ce480ada787f2cfbd696980ff3564415505b.zip | |
Merge branch 'master' into next
Conflicts:
fs/nfsd/nfs4recover.c
Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().
Signed-off-by: James Morris <[email protected]>
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions