diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-02-04 13:56:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-04 13:56:37 -0800 |
| commit | 45e826fd57bdb1c1009358608b663a22742d9f9e (patch) | |
| tree | de290a7cf1d0a1e5f286871ee55c8e3aef92f119 /drivers/net/ethernet/ti/tlan.c | |
| parent | net: add skb functions to process remote checksum offload (diff) | |
| parent | Bluetooth: Fix potential NULL dereference (diff) | |
| download | linux-dev-45e826fd57bdb1c1009358608b663a22742d9f9e.tar.xz linux-dev-45e826fd57bdb1c1009358608b663a22742d9f9e.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-02-03
Here's what's likely the last bluetooth-next pull request for 3.20.
Notable changes include:
- xHCI workaround + a new id for the ath3k driver
- Several new ids for the btusb driver
- Support for new Intel Bluetooth controllers
- Minor cleanups to ieee802154 code
- Nested sleep warning fix in socket accept() code path
- Fixes for Out of Band pairing handling
- Support for LE scan restarting for HCI_QUIRK_STRICT_DUPLICATE_FILTER
- Improvements to data we expose through debugfs
- Proper handling of Hardware Error HCI events
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/tlan.c')
0 files changed, 0 insertions, 0 deletions