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-03-24 16:42:54 -07:00
2015-02-17 09:27:54 -08:00
2015-04-09 00:01:38 -04:00
2015-02-15 10:48:44 -08:00
2015-03-24 15:39:26 +01:00
2015-04-01 10:29:05 -07:00
2015-02-03 15:48:51 -08:00
2015-03-02 16:43:41 -05:00
2015-02-03 15:58:39 -08:00
2015-04-09 00:01:38 -04:00
2015-02-04 09:15:18 +01:00
2015-03-12 09:45:46 -07:00
2015-03-31 12:01:19 -04:00
2015-02-18 08:40:29 +01:00
2015-04-09 00:01:38 -04:00
2015-02-17 09:38:59 -08:00
2015-04-09 00:01:38 -04:00
2015-02-15 10:24:55 -08:00
2015-04-02 13:53:53 -07:00
2015-02-03 15:58:39 -08:00