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-29 13:26:54 -07:00
2015-04-09 00:01:38 -04:00
2015-01-25 23:17:28 -05:00
2014-10-09 22:26:04 -04:00
2014-08-08 15:57:18 -07:00
2015-02-13 21:21:36 -08:00
2014-09-10 15:42:12 -07:00
2015-02-17 14:34:51 -08:00
2014-12-04 14:34:54 -05:00
2014-12-22 15:40:48 +01:00
2015-01-17 10:02:23 +13:00
2015-02-17 14:34:51 -08:00
2015-02-28 09:57:51 -08:00
2014-12-10 17:41:10 -08:00
2015-04-09 00:01:38 -04:00