diff --git a/[refs] b/[refs] index 5e3a38c644c3..9462ff623ccf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06e3041164a1c52d6e8a369af8be3827f428272b +refs/heads/master: 0da5f7c6d2a2653e3c8867df5f226e62377a141f diff --git a/trunk/include/net/af_unix.h b/trunk/include/net/af_unix.h index b5f8988e4283..0a996a3517ed 100644 --- a/trunk/include/net/af_unix.h +++ b/trunk/include/net/af_unix.h @@ -53,7 +53,6 @@ struct unix_sock { struct path path; struct mutex readlock; struct sock *peer; - struct sock *other; struct list_head link; atomic_long_t inflight; spinlock_t lock;