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
..
core	IB/uverbs: Prevent integer overflow in ib_umem_get address arithmetic	2015-04-02 09:53:59 -07:00
hw	Merge branch 'iocb' into for-davem	2015-04-09 00:01:38 -04:00
ulp	infiniband/ipoib: implement ndo_get_iflink	2015-04-02 14:05:01 -04:00
Kconfig	IB/core: Implement support for MMU notifiers regarding on demand paging regions	2014-12-15 18:13:36 -08:00
Makefile