diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-09-02 19:30:07 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-02 19:30:07 +0200 |
commit | 78ab952717b62c0ba6ca7f7a27eaa0486685e45f (patch) | |
tree | a4ab2bfc578f279fc6847031f501d84c75057531 /drivers/net/atlx | |
parent | starfire: Temporary kludge to fix powerpc build. (diff) | |
parent | mac80211: only cancel software-based scans on suspend (diff) | |
download | linux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.tar.xz linux-78ab952717b62c0ba6ca7f7a27eaa0486685e45f.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/atlx')
0 files changed, 0 insertions, 0 deletions