diff options
| author | Al Viro <[email protected]> | 2015-04-09 04:00:30 +0000 |
|---|---|---|
| committer | Al Viro <[email protected]> | 2015-04-09 04:01:38 +0000 |
| commit | 237dae889051ed4ebf438b08ca6c0e7c54b97774 (patch) | |
| tree | 0cbd9882d28f19875f5c1daf1698edaac985de0f /security/selinux/hooks.c | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | fs: move struct kiocb to fs.h (diff) | |
| download | kernel-237dae889051ed4ebf438b08ca6c0e7c54b97774.tar.gz kernel-237dae889051ed4ebf438b08ca6c0e7c54b97774.zip | |
Merge branch 'iocb' into for-davem
trivial conflict in net/socket.c and non-trivial one in crypto -
that one had evaded aio_complete() removal.
Signed-off-by: Al Viro <[email protected]>
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions