aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/microchip/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-10-11 05:15:30 -0700
committerDavid S. Miller <davem@davemloft.net>2015-10-11 05:15:30 -0700
commit7bcfeead48b6f920007ee41bc70a83b58c5ba396 (patch)
tree53c662af01d9a12e7cf2faee91637bf19ea19a82 /drivers/net/ethernet/microchip/Kconfig
parentBNX2: fix a Null Pointer for stats_blk (diff)
parentBluetooth: Fix basic debugfs entries for unconfigured controllers (diff)
downloadlinux-dev-7bcfeead48b6f920007ee41bc70a83b58c5ba396.tar.xz
linux-dev-7bcfeead48b6f920007ee41bc70a83b58c5ba396.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-08 Here's another set of Bluetooth & 802.15.4 patches for the 4.4 kernel. 802.15.4: - Many improvements & fixes to the mrf24j40 driver - Fixes and cleanups to nl802154, mac802154 & ieee802154 code Bluetooth: - New chipset support in btmrvl driver - Fixes & cleanups to btbcm, btmrvl, bpa10x & btintel drivers - Support for vendor specific diagnostic data through common API - Cleanups to the 6lowpan code - New events & message types for monitor channel Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/microchip/Kconfig')
0 files changed, 0 insertions, 0 deletions