summaryrefslogtreecommitdiffstats
path: root/drivers/atm/iphase.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-04-01 23:46:01 +0200
committerDavid S. Miller <davem@davemloft.net>2018-04-01 23:46:01 +0200
commit859a59352e926315b6384c5fd895b00a30659a12 (patch)
tree8fd65cdfe3152fb34f6558b8ef4f14275ded76e1 /drivers/atm/iphase.c
parentMerge branch 'sh_eth-remove-SH_ETH_OFFSET_INVALID-abuses' (diff)
parentBluetooth: Mark expected switch fall-throughs (diff)
downloadlinux-859a59352e926315b6384c5fd895b00a30659a12.tar.xz
linux-859a59352e926315b6384c5fd895b00a30659a12.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 2018-04-01 Here's (most likely) the last bluetooth-next pull request for the 4.17 kernel: - Remove unused btuart_cs driver (replaced by serial_cs + hci_uart) - New USB ID for Edimax EW-7611ULB controller - Cleanups & fixes to hci_bcm driver - Clenups to btmrvl driver Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm/iphase.c')
0 files changed, 0 insertions, 0 deletions