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-09-18 10:54:36 +02:00
2013-12-29 16:34:25 -05:00
2015-04-09 00:01:38 -04:00
2015-01-28 22:18:37 -08:00
2014-09-01 18:12:45 -07:00
2014-09-01 18:12:45 -07:00
2014-09-01 18:12:45 -07:00
2014-09-01 18:12:45 -07:00
2015-02-28 16:56:51 -05:00
2014-09-01 18:12:45 -07:00
2015-01-28 22:18:37 -08:00
2014-09-01 18:12:45 -07:00
2015-01-28 22:18:37 -08:00
2015-01-28 22:18:37 -08:00
2014-05-23 16:28:53 -04:00
2013-05-31 17:19:05 -07:00