summaryrefslogtreecommitdiffstats
path: root/net/atm/raw.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-05 22:02:56 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-05 22:02:56 +0100
commite1ca87bb1b64b044163e686ff3bb71405156c561 (patch)
tree598cb96d4b22749e07116cb4006d71fb5a5704ea /net/atm/raw.c
parentMerge branch 'cxgb4' (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff)
downloadlinux-e1ca87bb1b64b044163e686ff3bb71405156c561.tar.xz
linux-e1ca87bb1b64b044163e686ff3bb71405156c561.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== Please pull this batch of fixes intende for the 3.13 stream! For the mac80211 bits, Johannes says: "For now I have various fixes all over, mostly for issues introduced in relatively recent patches. There's no real pattern to it. Some of the issues like go back longer, but still seemed 3.13 material." And... "These are just two patches disabling the broken CSA code. Once this goes into your tree I'll merge it into mac80211-next and revert there (since we fixed the bugs there)." For the iwlwifi bits, Emmanuel says: "I have here a few fixes for BT Coex. One of them is a NULL pointer dereference. Another one avoids to enable a feature that can make the firmware unhappy since the firmware isn't ready for it yet. WE also avoid a WARNING that can be triggered upon association in not-so-bad cases even if the association succeeded. We add support for new NICs (not yet on the market) and bump the API so that 3.13 will be able to work with the new firmware that will be out soon hopefully. I also have a boundary check from Johannes." In addition to those... - Arend van Spriel fixes a brcmfmac problem that could use an uninitialized variable in an error path. - Borislav Petkov fixes a Kconfig-based build breakage problem for brcmsmac. - Michal Nazarewicz fixes a couple of NULL pointer dereference problems in ath9k and wcn36xx. - Sujith Manoharan fixes a couple of ath9k problems related to incorrect interpretation of EEPROM configuration data. - Ujjal Roy fixes a memory leak in mwifiex. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/raw.c')
0 files changed, 0 insertions, 0 deletions