diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:00:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 00:01:38 -0400 |
| commit | 29f17d3f44c368f0e791bb1e419ccd358f2d1430 (patch) | |
| tree | b87c9b49911e1f8ebf47b96015b3a589e98eaa3a /crypto/crc32.c | |
| parent | 866553560fd97461244bcd9b2147375b8115f5f7 (diff) | |
| parent | 9ece59e8fd3d017e04382709a4d48e81e00246fb (diff) | |
| download | linux-crypto-29f17d3f44c368f0e791bb1e419ccd358f2d1430.tar.gz linux-crypto-29f17d3f44c368f0e791bb1e419ccd358f2d1430.zip | |
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>
Diffstat (limited to 'crypto/crc32.c')
0 files changed, 0 insertions, 0 deletions