tree 39b976a58eb3acdf0a47999aebc2696a2c8f737f
parent 14d7e48751925b4d48f0fd2317b0570fd243f6fd
parent 72f9f8b58bc743e6b6abdc68f60db98486c3ffcf
author David S. Miller <davem@davemloft.net> 1463421397 -0400
committer David S. Miller <davem@davemloft.net> 1463421397 -0400

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>