Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Wed, 20 Jul 2016 21:42:28 +0000 (14:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Jul 2016 21:42:28 +0000 (14:42 -0700)
commit4599f772e7d94a25b0ecad203cdeabf1744b219c
tree3df0e34ca6cdcad7dceb4b38c9650fd093bf2247
parentb02b94b331be5097d248d49242bd1fc0649a8092
parente7acf43024e95faa7460e77fe7e0fec2a3de582a
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2016-07-19

Here's likely the last bluetooth-next pull request for the 4.8 kernel:

 - Fix for L2CAP setsockopt
 - Fix for is_suspending flag handling in btmrvl driver
 - Addition of Bluetooth HW & FW info fields to debugfs
 - Fix to use int instead of char for callback status.

The last one (from Geert Uytterhoeven) is actually not purely a
Bluetooth (or 802.15.4) patch, but it was agreed with other maintainers
that we take it through the bluetooth-next tree.

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>