linux/drivers/net/wireless/brcm80211
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
..
brcmfmac brcm80211: fmac: postpone dongle RF enabling. 2012-04-13 14:32:53 -04:00
brcmsmac Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-04-23 23:15:17 -04:00
brcmutil brcm80211: Use pr_fmt and pr_<level> 2012-01-24 14:21:14 -05:00
include brcm80211: fmac: clean up chip id table 2012-04-13 14:32:53 -04:00
Kconfig brcm80211: fmac: add USB support for bcm43235/6/8 chipsets 2012-02-22 14:48:53 -05:00
Makefile brcm80211: Use normal DEBUG define 2012-01-24 14:21:13 -05:00