From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 9 Apr 2015 04:00:30 +0000 (-0400)
Subject: Merge branch 'iocb' into for-davem
X-Git-Tag: omap-for-v4.1/fixes-rc1~141^2~15^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=237dae889051ed4ebf438b08ca6c0e7c54b97774;p=pandora-kernel.git

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>
---

237dae889051ed4ebf438b08ca6c0e7c54b97774
Reading git-diff-tree failed