From: David S. Miller Date: Mon, 23 Feb 2015 20:05:39 +0000 (-0500) Subject: Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=85689b24c539133d05022942e986df78e9bcfae1;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth Johan Hedberg says: ==================== pull request: bluetooth 2015-02-23 Here's one important fix for the 4.0-rc series. Refactoring of Intel Bluetooth controller detection ended up disabling some older ones which are based on CSR hardware. This patch re-introduces the necessary USB id and fixes the breakage. Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller --- 85689b24c539133d05022942e986df78e9bcfae1