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

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c

2012-08-21 16:00:21 -04:00

..

3945-debug.c

iwlegacy: move debugfs_ops to il_priv

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

3945-mac.c

mac80211: move TX station pointer and restructure TX

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

3945-rs.c

cfg80211: add 802.11ad (60gHz band) support

2012-07-02 15:11:10 +02:00

3945.c

drivers/net: Convert compare_ether_addr to ether_addr_equal

2012-05-10 23:33:01 -04:00

3945.h

iwlegacy: move debugfs_ops to il_priv

2012-02-22 14:51:13 -05: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

mac80211: move TX station pointer and restructure TX

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

4965-rs.c

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

2012-04-12 13:49:28 -04:00

4965.c

iwlegacy: merge all ops structures into one

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

4965.h

mac80211: move TX station pointer and restructure TX

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

commands.h

iwlegacy: indentions and whitespaces

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

common.c

iwlegacy: clean up suspend/resume

2012-08-10 15:26:59 -04:00

common.h

iwlegacy: clean up suspend/resume

2012-08-10 15:26:59 -04: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