net/netfilter/xt_socket.c
: GCC 4.8.x fix up
 net/bluetooth/hci_conn.c
: GCC 4.8.x fix up

Conflicts:
	net/bluetooth/hci_conn.c