summaryrefslogtreecommitdiffstats
path: root/net/tipc/msg.h
diff options
context:
space:
mode:
authorDavid S. Miller2015-03-14 19:29:45 +0100
committerDavid S. Miller2015-03-14 19:29:45 +0100
commit5f1764ddfeb038decfe2b2fda030d0bed43fa36a (patch)
treea42d36330758ccce3becb22b96c8c748b89a837a /net/tipc/msg.h
parentMerge branch 'bcmgenet_xmit_more' (diff)
parentieee802154: don't export static symbol (diff)
downloadkernel-qcow2-linux-5f1764ddfeb038decfe2b2fda030d0bed43fa36a.tar.gz
kernel-qcow2-linux-5f1764ddfeb038decfe2b2fda030d0bed43fa36a.tar.xz
kernel-qcow2-linux-5f1764ddfeb038decfe2b2fda030d0bed43fa36a.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== Here's another set of Bluetooth & ieee802154 patches intended for 4.1: - Added support for QCA ROME chipset family in the btusb driver - at86rf230 driver fixes & cleanups - ieee802154 cleanups - Refactoring of Bluetooth mgmt API to allow new users - New setting for static Bluetooth address exposed to user space - Refactoring of hci_dev flags to remove limit of 32 - Remove unnecessary fast-connectable setting usage restrictions - Fix behavior to be consistent when trying to pair already paired device - Service discovery corner-case fixes Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/msg.h')
0 files changed, 0 insertions, 0 deletions