diff --git a/[refs] b/[refs] index 713f3dd35c29..03a9395e2b9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6a0dc822497e1c0b9e8c4add270cc27fce48454 +refs/heads/master: 2cb3377a295aade1f2e192d4bea948b2196fb162 diff --git a/trunk/include/linux/socket.h b/trunk/include/linux/socket.h index f852e1afd65a..c22ef1c1afb8 100644 --- a/trunk/include/linux/socket.h +++ b/trunk/include/linux/socket.h @@ -291,6 +291,7 @@ struct ucred { #define SOL_TIPC 271 #define SOL_RXRPC 272 #define SOL_PPPOL2TP 273 +#define SOL_BLUETOOTH 274 /* IPX options */ #define IPX_TYPE 1