diff options
author | 2014-12-19 15:47:32 -0500 | |
---|---|---|
committer | 2014-12-19 15:47:32 -0500 | |
commit | 02d6a746c3f0cdd6f8aad0afd0b32d4646d6525e (patch) | |
tree | 7a857f82bed585a733bd2e0071607f96d03aa2e3 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | enic: fix rx skb checksum (diff) | |
parent | Bluetooth: bnep: bnep_add_connection() should verify that it's dealing with l2cap socket (diff) | |
download | linux-dev-02d6a746c3f0cdd6f8aad0afd0b32d4646d6525e.tar.xz linux-dev-02d6a746c3f0cdd6f8aad0afd0b32d4646d6525e.zip |
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>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions