git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7abccdb e2e40f2)
Merge branch 'iocb' into for-davem
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 9 Apr 2015 04:00:30 +0000 (00:00 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 9 Apr 2015 04:01:38 +0000 (00:01 -0400)
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>

Trivial merge
Pandora Kernel Repository