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
..
2014-01-25 23:58:18 -05:00
2014-10-09 02:39:04 -04:00
2013-02-28 01:18:14 -05:00
2015-03-25 20:28:11 -04:00
2014-10-09 02:39:04 -04:00
2014-10-09 02:39:04 -04:00
2010-08-02 14:28:35 -05:00