raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-07 10:29:52 +00:00
Code Issues Projects Releases Wiki Activity
Files
68912df901b9807a708cd1599b30fa56548d15e1
linux/include/net/sock.h
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

63 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink