| commit | 237dae889051ed4ebf438b08ca6c0e7c54b97774 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Thu Apr 09 00:00:30 2015 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Thu Apr 09 00:01:38 2015 -0400 |
| tree | 0cbd9882d28f19875f5c1daf1698edaac985de0f | |
| parent | 7abccdba25be45630eede85053496f1f48d36ec8 [diff] | |
| parent | e2e40f2c1ed433c5e224525c8c862fd32e5d3df2 [diff] |
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>