summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-01-31 02:32:42 +0300
committerDavid S. Miller <davem@davemloft.net>2016-01-31 02:32:42 +0300
commit53729eb174c1589f9185340ffe8c10b3f39f3ef3 (patch)
treef72309f53abf3a5b99d1e56270291c6abaeede3d /net/ipv4
parent99b4dd9f2423130875ac486fe587cd103c64f753 (diff)
parentcff10ce7b4f02718ffd25e3914e60559f5ef6ca0 (diff)
downloadlinux-53729eb174c1589f9185340ffe8c10b3f39f3ef3.tar.xz
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says: ==================== pull request: bluetooth 2016-01-30 Here's a set of important Bluetooth fixes for the 4.5 kernel: - Two fixes to 6LoWPAN code (one fixing a potential crash) - Fix LE pairing with devices using both public and random addresses - Fix allocation of dynamic LE PSM values - Fix missing COMPATIBLE_IOCTL for UART line discipline Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions