aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc/nci/spi.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-30 19:41:10 +0900
committerDavid S. Miller <davem@davemloft.net>2015-10-30 19:41:10 +0900
commit5bf8921116ce0972c23b78ea2d98e5c0c6a99ae2 (patch)
treefdff3be90cceae35057dab073a0359cddd25d521 /net/nfc/nci/spi.c
parentipv6: recreate ipv6 link-local addresses when increasing MTU over IPV6_MIN_MTU (diff)
parentbluetooth: 6lowpan: fix NOHZ: local_softirq_pending (diff)
downloadlinux-dev-5bf8921116ce0972c23b78ea2d98e5c0c6a99ae2.tar.xz
linux-dev-5bf8921116ce0972c23b78ea2d98e5c0c6a99ae2.zip
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-10-28 Here are a some more Bluetooth patches for 4.4 which collected up during the past week. The most important ones are from Kuba Pawlak for fixing locking issues with SCO sockets. There's also a fix from Alexander Aring for 6lowpan, a memleak fix from Julia Lawall for the btmrvl driver and some cleanup patches from Marcel. Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc/nci/spi.c')
0 files changed, 0 insertions, 0 deletions