summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mac80211.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-11-18 15:13:26 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-11-18 15:13:26 -0500
commitf48ecb19bc0443a4272dd0934e7bee4480610df9 (patch)
treeeb29c8f7491e0fbf93e0c722a4b3feb575fc93c3 /drivers/net/wireless/iwlwifi/mvm/mac80211.c
parent47b6308b643302e642ca2a5cb6470926f7e1c428 (diff)
parenta86c02ea38c53b695209b1181f9e2e18d73eb4e8 (diff)
downloadlinux-stable-f48ecb19bc0443a4272dd0934e7bee4480610df9.tar.gz
linux-stable-f48ecb19bc0443a4272dd0934e7bee4480610df9.tar.bz2
linux-stable-f48ecb19bc0443a4272dd0934e7bee4480610df9.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg <johan.hedberg@gmail.com> says: "Here's another bluetooth-next pull request for 3.19. We've got: - Various fixes, cleanups and improvements to ieee802154/mac802154 - Support for a Broadcom BCM20702A1 variant - Lots of lockdep fixes - Fixed handling of LE CoC errors that should trigger SMP" Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
0 files changed, 0 insertions, 0 deletions