summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-04-17 22:00:57 +0300
committerDavid S. Miller <davem@davemloft.net>2017-04-17 22:00:57 +0300
commit450cc8cce23d0db11b19fa89973ddb6d5edd010c (patch)
treebe70a3831b21b77f17e236bb452a2ced6066bf96 /.gitignore
parentd584fec634a4426ad476657383d3a9049565f884 (diff)
parent019aa56b7df8a796b2c01a56269a370ad3442ec7 (diff)
downloadlinux-450cc8cce23d0db11b19fa89973ddb6d5edd010c.tar.xz
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2017-04-14 Here's the main batch of Bluetooth & 802.15.4 patches for the 4.12 kernel. - Many fixes to 6LoWPAN, in particular for BLE - New CA8210 IEEE 802.15.4 device driver (accounting for most of the lines of code added in this pull request) - Added Nokia Bluetooth (UART) HCI driver - Some serdev & TTY changes that are dependencies for the Nokia driver (with acks from relevant maintainers and an agreement that these come through the bluetooth tree) - Support for new Intel Bluetooth device - Various other minor cleanups/fixes here and there Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions