Al Viro 237dae8890 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>
2015-04-09 00:01:38 -04:00
..
2015-04-09 00:01:38 -04:00
2015-03-06 13:04:42 +01:00
2014-12-14 16:10:09 -08:00
2015-02-11 08:51:59 -08:00