Merge "Bluetooth: Move Discovery timers to hci_dev struct" into msm-3.0