Merge remote-tracking branch 'bluetooth/master'

Conflicts:
	net/bluetooth/l2cap_sock.c

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc include/net/bluetooth/bluetooth.h
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
index e8292369cdcf68981b4a59969b2c4af41b703f90,646aefc4f1d730e8d04b3b4d69cc1e21cf64aebe..930a95b5016fc5e8b06ce88571c5f6c10ece4dd7
--- 1/net/bluetooth/l2cap_sock.c
--- 2/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@@ -931,12 -944,7 +946,9 @@@ static void l2cap_sock_init(struct soc
                chan->max_tx = pchan->max_tx;
                chan->tx_win = pchan->tx_win;
                chan->sec_level = pchan->sec_level;
-               chan->role_switch = pchan->role_switch;
-               chan->force_reliable = pchan->force_reliable;
-               chan->flushable = pchan->flushable;
-               chan->force_active = pchan->force_active;
+               chan->flags = pchan->flags;
 +
 +              security_sk_clone(parent, sk);
        } else {
  
                switch (sk->sk_type) {

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge