diff options
author | 2016-05-16 13:56:37 -0400 | |
---|---|---|
committer | 2016-05-16 13:56:37 -0400 | |
commit | 2ffd7e035601268915a393ae0b7cac34c27e190e (patch) | |
tree | 39b976a58eb3acdf0a47999aebc2696a2c8f737f /net/switchdev/switchdev.c | |
parent | Merge branch 'w5100-small-changes' (diff) | |
parent | Bluetooth: Add USB ID 13D3:3487 to ath3k (diff) | |
download | linux-dev-2ffd7e035601268915a393ae0b7cac34c27e190e.tar.xz linux-dev-2ffd7e035601268915a393ae0b7cac34c27e190e.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 2016-05-14
Here are two more Bluetooth patches for the 4.7 kernel which we wanted
to get into net-next before the merge window opens. Please let me know
if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions