diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-02 02:06:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-02 02:06:29 +0300 |
| commit | cd842a67e660dd3a2605557b9a64ea01cb57ba72 (patch) | |
| tree | 32e59dfc5d1ebe0d4b01eeb84e7a85d465b7145f /net | |
| parent | ccd740cbc6e01b2a08baa341867063ed2887f4b9 (diff) | |
| parent | 38fe44e61a894f1c7b3e60b0614030271070ea53 (diff) | |
| download | linux-cd842a67e660dd3a2605557b9a64ea01cb57ba72.tar.xz | |
Merge tag 'wireless-drivers-for-davem-2015-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
iwlwifi:
* fix OTP parsing 8260
* fix powersave handling for 8260
brcmfmac:
* fix null pointer crash
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions