diff --git a/[refs] b/[refs] index 2bc720227c9d..892397ab8181 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0796d5c73e59786d09a1e617689d1d415f2db44 +refs/heads/master: e2aec372ff4b7e78e79c308104a860ae0ed20950 diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h index 2b4deeeb8646..dee0b11a8759 100644 --- a/trunk/include/linux/net.h +++ b/trunk/include/linux/net.h @@ -129,10 +129,9 @@ struct socket_wq { * @type: socket type (%SOCK_STREAM, etc) * @flags: socket flags (%SOCK_ASYNC_NOSPACE, etc) * @ops: protocol specific socket operations - * @fasync_list: Asynchronous wake up list * @file: File back pointer for gc * @sk: internal networking protocol agnostic socket representation - * @wait: wait queue for several uses + * @wq: wait queue for several uses */ struct socket { socket_state state;