linux-next: manual merge of the bluetooth tree with Linus' tree

Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in drivers/bluetooth/btusb.c between commit 3c49aa852e00 ("Revert "Bluetooth: Enable autosuspend for Intel Bluetooth device"") from Linus' tree and commit 10d4c6736ea6 ("Bluetooth: btusb: Add Broadcom patch RAM support")

linux-next: manual merge of the bluetooth tree with Linus' tree

Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in drivers/bluetooth/btusb.c between commit 3c49aa852e00 (Revert Bluetooth: Enable autosuspend for Intel Bluetooth device) from Linus' tree and commit 10d4c6736ea6 (Bluetooth: btusb: Add Broadcom patch RAM support) from the

linux-next: manual merge of the bluetooth tree with Linus' tree

Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in net/bluetooth/rfcomm/core.c between commit 25cc4ae913a4 ("net: remove redundant check for timer pending state before del_timer") from Linus' tree and commit 5c87e6efd14d ("Bluetooth: Avoid rfcomm_session_timeout using

linux-next: manual merge of the bluetooth tree with Linus' tree

Hi Gustavo, Today's linux-next merge of the bluetooth tree got a conflict in net/bluetooth/rfcomm/core.c between commit 25cc4ae913a4 (net: remove redundant check for timer pending state before del_timer) from Linus' tree and commit 5c87e6efd14d (Bluetooth: Avoid rfcomm_session_timeout using freed