Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
authorDavid S. Miller <davem@davemloft.net>
Fri, 19 Dec 2014 20:47:32 +0000 (15:47 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Dec 2014 20:47:32 +0000 (15:47 -0500)
commit02d6a746c3f0cdd6f8aad0afd0b32d4646d6525e
tree7a857f82bed585a733bd2e0071607f96d03aa2e3
parent17e96834fd35997ca7cdfbf15413bcd5a36ad448
parent71bb99a02b32b4cc4265118e85f6035ca72923f0
Merge branch 'for-upstream' of git://git./linux/kernel/git/bluetooth/bluetooth

Johan Hedberg says:

====================
pull request: bluetooth 2014-12-19

Here's one more pull request for 3.19. It contains the socket type
verification fixes from Al Viro as well as an skb double-free fix for
6lowpan from Jukka Rissanen.

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

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