diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-17 09:28:58 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-17 09:28:58 +0400 |
| commit | a1f6d8f771d80ab0beea787aa4f1d02d2eacf22c (patch) | |
| tree | 750bc5d1a6de887e82e90ff1cc4a84d770699212 /net/ipv4 | |
| parent | 3f0c3c8fe30c725c1264fb6db8cc4b69db3a658a (diff) | |
| parent | 7a253c2954dad9d70fa2e07b45b55ea4bee6c6c7 (diff) | |
| download | linux-a1f6d8f771d80ab0beea787aa4f1d02d2eacf22c.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
This is a batch of fixes intended for the 3.6 stream.
Arend van Spriel sends a simple thinko fix to correct a constant,
preventing the setting of an invalid power level.
Colin Ian King gives us a simple allocation failure check to avoid a
NULL pointer dereference.
Felix Fietkau sends another ath9k tx power patch, this time disabling a
feature that has been reported to cause rx problems.
Hante Meuleman provides a pair of endian fixes for brcmfmac.
Larry Finger offers an rtlwifi fix that avoids a system lockup related
to loading the wrong firmware for RTL8188CE devices.
These have been in linux-next for a few days and I think they should be
included in the final 3.6 kernel if possible.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions