| commit | 02d6a746c3f0cdd6f8aad0afd0b32d4646d6525e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Dec 19 15:47:32 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Dec 19 15:47:32 2014 -0500 |
| tree | 7a857f82bed585a733bd2e0071607f96d03aa2e3 | |
| parent | 17e96834fd35997ca7cdfbf15413bcd5a36ad448 [diff] | |
| parent | 71bb99a02b32b4cc4265118e85f6035ca72923f0 [diff] |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/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>