]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Sat, 9 May 2015 19:51:00 +0000 (15:51 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 May 2015 19:51:00 +0000 (15:51 -0400)
commit41a533d692068263bc8b6d9a71193439c6933313
tree4f51360cac0abfed65441bcf2165fc8ebe31a150
parent955dec395702e7caacbae2be8382a465700f5337
parent7f1902b99925c3e2ddacb46aaf5c52f2b0078bb8
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>
net/mac802154/main.c