diff options
| author | David S. Miller | 2015-05-31 08:26:45 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-05-31 08:26:45 +0200 |
| commit | 9d52bf0a238657ebfddaf5976409ac33174b9f78 (patch) | |
| tree | 4bab8453a145bdb38eaea6d83c2368d6a7f7ce2c /drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | |
| parent | Merge branch 'mlx5-next' (diff) | |
| parent | atusb: add support for at86rf230 (diff) | |
| download | kernel-qcow2-linux-9d52bf0a238657ebfddaf5976409ac33174b9f78.tar.gz kernel-qcow2-linux-9d52bf0a238657ebfddaf5976409ac33174b9f78.tar.xz kernel-qcow2-linux-9d52bf0a238657ebfddaf5976409ac33174b9f78.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-05-28
Here's a set of patches intended for 4.2. The majority of the changes
are on the 802.15.4 side of things rather than Bluetooth related:
- All sorts of cleanups & fixes to ieee802154 and related drivers
- Rework of tx power support in ieee802154 and its drivers
- Support for setting ieee802154 tx power through nl802154
- New IDs for the btusb driver
- Various cleanups & smaller fixes to btusb
- New btrtl driver for Realtec devices
- Fix suspend/resume for Realtek devices
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/mellanox/mlx4/resource_tracker.c')
0 files changed, 0 insertions, 0 deletions