John W. Linville 655d8e2328 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next ...

Conflicts:
	drivers/net/wireless/ath/carl9170/debug.c
	drivers/net/wireless/ath/carl9170/main.c
	net/mac80211/ieee80211_i.h

2013-04-10 14:09:54 -04:00

..

def.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

dm.c

rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192se: rtl8192de: Shorten some variable names

2012-10-30 16:17:54 -04:00

dm.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

hw.c

rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192de: rtl8723ae: Add changes required by adding rtl81988ee

2013-04-01 16:20:53 -04:00

hw.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

led.c

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

led.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

mac.c

net: wireless/rtlwifi: fix uninitialized variable issue

2013-02-08 14:51:31 -05:00

mac.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

Makefile

rtlwifi: rtl8192ce: rtl8192cu: Fix multiple def errors for allyesconfig build

2011-02-23 16:28:41 -05:00

phy.c

drivers/net: Remove boolean comparisons to true/false

2012-02-13 00:47:40 -05:00

phy.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

reg.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

rf.c

rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192se: rtl8192de: Shorten some variable names

2012-10-30 16:17:54 -04:00

rf.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

sw.c

rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192de: rtl8723ae: Add changes required by adding rtl81988ee

2013-04-01 16:20:53 -04:00

sw.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

table.c

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

table.h

rtl8192cu: Update copyright dates

2012-01-24 14:08:38 -05:00

trx.c

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-04-10 14:09:54 -04:00

trx.h

mac80211: move TX station pointer and restructure TX

2012-07-31 16:18:39 +02:00