John W. Linville 9a574cd67a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ...

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

2013-03-29 16:41:36 -04:00

..

phy

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-03-29 16:41:36 -04:00

aiutils.c

brcmsmac: Remove unused macro SI_MSG

2013-03-27 13:37:32 -04:00

aiutils.h

brcmsmac: use chip and package id constants from bcma

2012-07-10 12:16:52 -04:00

ampdu.c

brcmsmac: remove dead code

2013-01-07 15:16:55 -05:00

ampdu.h

brcmsmac: Remove internal tx queue

2012-11-20 14:04:23 -05:00

antsel.c

brcmsmac: Use debug macros for general error and debug statements

2012-11-20 14:06:16 -05:00

antsel.h

net: wireless: add brcm80211 drivers

2011-10-11 15:55:30 -04:00

brcms_trace_events.c

net: wireless: add brcm80211 drivers

2011-10-11 15:55:30 -04:00

brcms_trace_events.h

brcmsmac: Add tracepoint for AMPDU session information

2012-11-20 14:08:06 -05:00

channel.c

brcmsmac: fix brcms_c_country_valid()

2013-02-14 14:24:06 -05:00

channel.h

brcm80211: smac: use current regulatory domain when checking whether OFDM is allowed

2012-06-20 15:14:40 -04:00

d11.h

brcmsmac: implement ieee80211_ops get_tsf and set_tsf

2013-03-27 13:37:33 -04:00

debug.c

brcmsmac: remove duplicated include from debug.c

2012-12-06 14:58:55 -05:00

debug.h

brcmsmac: add copyright information for Canonical

2013-01-02 14:38:36 -05:00

dma.c

brcmsmac: Fix possible NULL pointer dereference in _dma_ctrlflags()

2012-11-30 14:00:39 -05:00

dma.h

brcmsmac: Add brcms_dbg_dma() debug macro

2012-11-20 14:07:12 -05:00

led.c

brcmsmac: radio on led support

2013-03-06 16:28:20 -05:00

led.h

brcmsmac: radio on led support

2013-03-06 16:28:20 -05:00

mac80211_if.c

brcmsmac: add support for adhoc mode

2013-03-27 13:37:37 -04:00

mac80211_if.h

brcmsmac: radio on led support

2013-03-06 16:28:20 -05:00

main.c

brcmsmac: add support for adhoc mode

2013-03-27 13:37:37 -04:00

main.h

brcmsmac: add support for probe response template

2013-03-27 13:37:36 -04:00

Makefile

brcmsmac: radio on led support

2013-03-06 16:28:20 -05:00

phy_shim.c

brcmsmac: remove brcmsmac own sprom parsing

2012-05-16 12:45:23 -04:00

phy_shim.h

brcmsmac: remove brcmsmac own sprom parsing

2012-05-16 12:45:23 -04:00

pmu.c

brcmsmac: remove some pmu functions and use the bcma equivalents

2013-03-27 13:39:09 -04:00

pmu.h

brcmsmac: remove some pmu functions and use the bcma equivalents

2013-03-27 13:39:09 -04:00

pub.h

brcmsmac: add support for adhoc mode

2013-03-27 13:37:37 -04:00

rate.c

net: wireless: add brcm80211 drivers

2011-10-11 15:55:30 -04:00

rate.h

brcm80211: smac: remove phy api bypass in rate.h

2011-11-08 15:54:09 -05:00

scb.h

brcmsmac: remove dead code

2013-01-07 15:16:55 -05:00

stf.c

brcmsmac: Add brcms_dbg_ht() debug macro

2012-11-20 14:07:25 -05:00

stf.h

net: wireless: add brcm80211 drivers

2011-10-11 15:55:30 -04:00

types.h

brcm80211: Convert log message levels to debug levels

2012-11-20 14:05:37 -05:00

ucode_loader.c

net: wireless: add brcm80211 drivers

2011-10-11 15:55:30 -04:00

ucode_loader.h

net: wireless: add brcm80211 drivers

2011-10-11 15:55:30 -04:00