Home
last modified time | relevance | path

Searched hist:"237 dae88" (Results 1 – 6 of 6) sorted by relevance

/openbmc/linux/fs/affs/
H A Dfile.c237dae88 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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>
/openbmc/linux/crypto/
H A Dalgif_skcipher.c237dae88 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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>
/openbmc/linux/net/ipv4/
H A Draw.c237dae88 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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>
/openbmc/linux/net/
H A Dsocket.c237dae88 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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>
/openbmc/linux/include/net/
H A Dsock.h237dae88 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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>
/openbmc/linux/include/linux/
H A Dfs.h237dae88 Wed Apr 08 23:00:30 CDT 2015 Al Viro <viro@zeniv.linux.org.uk> 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>