tree 4f51360cac0abfed65441bcf2165fc8ebe31a150
parent 31ccd0e66d41f73cfc21a8de976e713455205228
parent 89eb6d0677a6daf134015bc7bd5ec1432911eed2
author David S. Miller <davem@davemloft.net> 1431201060 -0400
committer David S. Miller <davem@davemloft.net> 1431201060 -0400

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

Johan Hedberg says:

====================
Here are a couple of important Bluetooth & mac802154 fixes for 4.1:

 - mac802154 fix for crypto algorithm allocation failure checking
 - mac802154 wpan phy leak fix for error code path
 - Fix for not calling Bluetooth shutdown() if interface is not up

Let me know if there are any issues pulling. Thanks.
====================

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