diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-27 23:25:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-27 23:25:40 +0200 |
| commit | 7b9b04fb728ec0b94464ed902f3395aa592c5bcf (patch) | |
| tree | 67ac35b982e779312366d834694b3e35ea07062b /drivers/rapidio/rio-scan.c | |
| parent | tcp: perform DMA to userspace only if there is a task waiting for it (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-7b9b04fb728ec0b94464ed902f3395aa592c5bcf.tar.xz linux-7b9b04fb728ec0b94464ed902f3395aa592c5bcf.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
These fixes are intended for the 3.6 stream.
Hauke Mehrtens provides a pair of bcma fixes, one to fix a build
regression on mips and another to correct a pair of missing iounmap
calls.
Thomas Huehn offers a mac80211_hwsim fix to avoid a possible
use-after-free bug.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/rapidio/rio-scan.c')
0 files changed, 0 insertions, 0 deletions