summaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-01-18 00:25:30 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-18 00:25:30 -0500
commite445dd5f6745922bf4d8c18e1f071b28c5a061bb (patch)
treedfb23a2d6375807fb05d07951f35a4dd29e4631b /net/can
parent3aeb66176ffa8fefd7a9f7d37bda1d8adcf469a1 (diff)
parent0026b6551b51a9520b912f41b8d447b89a825f5a (diff)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2015-01-16 Here are some more bluetooth & ieee802154 patches intended for 3.20: - Refactoring & cleanups of ieee802154 & 6lowpan code - Various fixes to the btmrvl driver - Fixes for Bluetooth Low Energy Privacy feature handling - Added build-time sanity checks for sockaddr sizes - Fixes for Security Manager registration on LE-only controllers - Refactoring of broken inquiry mode handling to a generic quirk Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions