linux-pinenote/drivers/net/wireless/brcm80211/brcmsmac
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
phy brcm80211: replace open-coded ARRAY_SIZE with the macro 2012-04-12 15:10:46 -04:00
aiutils.c brcm80211: Use normal DEBUG define 2012-01-24 14:21:13 -05:00
aiutils.h brcm80211: smac: cleanup buscore handling in aiutils.c 2011-12-13 15:48:32 -05:00
ampdu.c brcm80211: smac: cleanup couple of debug output statements 2012-03-05 15:54:03 -05:00
ampdu.h
antsel.c
antsel.h
brcms_trace_events.c
brcms_trace_events.h
channel.c brcm80211: smac: only provide valid regulatory hint 2012-04-13 14:32:53 -04:00
channel.h
d11.h wireless: Remove unnecessary ; from while (0) macros 2012-04-11 16:23:56 -04:00
dma.c brcm80211: Use normal DEBUG define 2012-01-24 14:21:13 -05:00
dma.h brcm80211: smac: use bcma function for register access in dma.c 2011-12-13 15:32:56 -05:00
mac80211_if.c brcm80211: smac: do not use US as fallback regulatory hint 2012-04-13 14:32:53 -04:00
mac80211_if.h brcm80211: Use normal DEBUG define 2012-01-24 14:21:13 -05:00
main.c brcm80211: smac: resume transmit fifo upon receiving frames 2012-04-13 14:05:35 -04:00
main.h brcm80211: Convert printk(KERN_DEBUG to pr_debug 2012-01-24 14:21:14 -05:00
Makefile
nicpci.c brcm80211: smac: cleanup buscore handling in aiutils.c 2011-12-13 15:48:32 -05:00
nicpci.h brcm80211: smac: use bcma core access functions in nicpci.c 2011-12-13 15:33:17 -05:00
otp.c brcm80211: smac: use bcma core access functions in otp.c 2011-12-13 15:47:58 -05:00
otp.h
phy_shim.c
phy_shim.h
pmu.c brcm80211: smac: remove ai_switch_core() function 2011-12-13 15:48:23 -05:00
pmu.h brcm80211: smac: remove ai_switch_core() function 2011-12-13 15:48:23 -05:00
pub.h brcm80211: smac: change attach interfaces in main.c for bcma support 2011-12-13 15:32:07 -05:00
rate.c
rate.h brcm80211: smac: remove phy api bypass in rate.h 2011-11-08 15:54:09 -05:00
scb.h
srom.c brcm80211: smac: remove smatch warnings from brcmsmac code 2012-02-22 14:48:50 -05:00
srom.h brcm80211: smac: use bcma core access function in srom.c 2011-12-13 15:48:01 -05:00
stf.c brcm80211: removed unused functions 2011-10-14 14:48:18 -04:00
stf.h
types.h brcm80211: smac: remove register access macro definitions 2011-12-13 15:48:10 -05:00
ucode_loader.c
ucode_loader.h