diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:00:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:01:38 -0400 |
| commit | 237dae889051ed4ebf438b08ca6c0e7c54b97774 (patch) | |
| tree | 0cbd9882d28f19875f5c1daf1698edaac985de0f /include/net/compat.h | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next (diff) | |
| parent | fs: move struct kiocb to fs.h (diff) | |
| download | linux-dev-237dae889051ed4ebf438b08ca6c0e7c54b97774.tar.xz linux-dev-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 <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/net/compat.h')
0 files changed, 0 insertions, 0 deletions