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

..

3945-debug.c

iwlegacy: move debugfs_ops to il_priv

2012-02-22 14:51:13 -05:00

3945-mac.c

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

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

3945-rs.c

mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan

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

3945.c

iwlegacy: initialize rx_status

2012-11-26 14:54:20 -05:00

3945.h

wireless: move sequence number arithmetic to ieee80211.h

2013-03-06 16:35:44 +01:00

4965-calib.c

iwlegacy: remove enum iw_calib and related code

2012-02-29 14:14:55 -05:00

4965-debug.c

iwlegacy: move debugfs_ops to il_priv

2012-02-22 14:51:13 -05:00

4965-mac.c

iwlegacy: fix sparse warnings

2013-03-11 15:06:13 -04:00

4965-rs.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

4965.c

net: iwlegacy: remove unused variable

2013-01-30 15:07:08 -05:00

4965.h

iwlegacy: Use standard #defines for PCIe Capability ASPM fields

2012-12-07 11:19:52 -07:00

commands.h

iwl4965: report A-MPDU status

2013-02-01 14:27:21 -05:00

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

common.h

mac80211: pass queue bitmap to flush operation

2013-03-18 20:15:03 +01:00

csr.h

iwlegacy: indentions and whitespaces

2011-11-15 14:45:59 +01:00

debug.c

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

iwl-spectrum.h

iwlegacy: rename iwl to il

2011-11-15 11:16:58 +01:00

Kconfig

iwlegacy: Kconfig: Change Debug Option to be more clear

2012-02-29 14:14:55 -05:00

Makefile

iwlegacy: rename iwl-debug.c to debug.c

2011-11-15 14:24:36 +01:00

prph.h

iwlegacy: indentions and whitespaces

2011-11-15 14:45:59 +01:00