diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-23 15:05:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-23 15:05:39 -0500 |
| commit | 85689b24c539133d05022942e986df78e9bcfae1 (patch) | |
| tree | e91f7abb57aba30206344525deb272126c20d3dc /net | |
| parent | 6514890f7aa8dd75fa46e282a1c7a8615e86f363 (diff) | |
| parent | 407550fe2ccfca3fa0ac4bcdb0a412adeabf84ba (diff) | |
| download | linux-85689b24c539133d05022942e986df78e9bcfae1.tar.bz2 | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/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 <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions