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

..

carl9170.h

carl9170: remove fast channel change feature

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

cmd.c

wireless: Remove casts to same type

2012-06-06 09:31:33 -07:00

cmd.h

wireless: Remove unnecessary ; from while (0) macros

2012-04-11 16:23:56 -04:00

debug.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

debug.h

carl9170: firmware parser and debugfs code

2010-09-14 16:03:42 -04:00

eeprom.h

…

fw.c

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

2013-01-28 13:54:03 -05:00

fwcmd.h

carl9170: import 1.9.7 firmware headers

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

fwdesc.h

carl9170: import 1.9.6 firmware headers

2012-07-11 15:38:26 -04:00

hw.h

carl9170: import 1.9.7 firmware headers

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

Kconfig

drivers/net/wireless/ath/carl9170: remove depends on CONFIG_EXPERIMENTAL

2013-01-22 12:01:35 -08:00

led.c

carl9170: fix formatting issues found by checkpatch

2011-07-15 13:38:34 -04:00

mac.c

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

2013-03-25 19:19:35 +01:00

main.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

Makefile

carl9170: Makefile, Kconfig files and MAINTAINERS

2010-09-14 16:03:42 -04:00

phy.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

phy.h

carl9170: import hw/fw header updates

2010-11-15 13:25:29 -05:00

rx.c

carl9170: fix copy and paste mishap in carl9170_handle_mpdu

2012-12-10 15:47:31 -05:00

tx.c

carl9170: fix frame drop and WARN due to minstrel_ht change

2013-03-06 16:24:25 -05:00

usb.c

carl9170: handle traps from firmware loader

2012-10-19 15:53:20 -04:00

version.h

carl9170: import 1.9.7 firmware headers

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

wlan.h

carl9170: import 1.9.4 firmware headers

2011-07-05 15:26:51 -04:00