David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/mac80211/sta_info.c net/wireless/core.h Two minor conflicts in wireless. Overlapping additions of extern declarations in net/wireless/core.h and a bug fix overlapping with the addition of a boolean parameter to __ieee80211_key_free(). Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-01 13:36:50 -04:00
..
.gitignore	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
ap.c	cfg80211: move exported event functions into nl80211	2013-03-06 16:35:46 +01:00
chan.c	cfg80211: allow drivers to selectively disable 80/160 MHz	2013-02-15 09:41:38 +01:00
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
core.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
db.txt	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
debugfs.c	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
debugfs.h	cfg80211/mac80211: use debugfs_remove_recursive	2009-10-30 16:49:18 -04:00
ethtool.c	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
ethtool.h	net/wireless/ethtool.h: drop unnecessary include of linux/ethtool.h	2009-10-07 16:39:49 -04:00
genregdb.awk	cfg80211: relicense reg.c reg.h and genregdb.awk to ISC	2012-01-04 14:30:41 -05:00
ibss.c	cfg80211: pass wiphy to cfg80211_ref_bss/put_bss	2013-02-11 18:44:52 +01:00
Kconfig	lib80211: hide Kconfig symbol	2012-11-16 14:29:09 -05:00
lib80211_crypt_ccmp.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
lib80211_crypt_tkip.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
lib80211_crypt_wep.c	wireless: Remove unnecessary OOM logging messages	2011-09-13 15:45:02 -04:00
lib80211.c	lib80211: remove exports for functions not called by other modules	2011-08-09 15:42:36 -04:00
Makefile	cfg80211: add tracing to rdev-ops	2012-10-18 10:53:37 +02:00
mesh.c	nl80211: explicit userspace MPM	2013-03-06 16:36:11 +01:00
mlme.c	cfg80211: refactor association parameters	2013-03-06 16:35:49 +01:00
nl80211.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
nl80211.h	cfg80211: move exported event functions into nl80211	2013-03-06 16:35:46 +01:00
radiotap.c	wireless: add radiotap A-MPDU status field	2012-08-20 13:53:09 +02:00
rdev-ops.h	cfg80211/mac80211: disconnect on suspend	2013-03-06 16:35:55 +01:00
reg.c	regulatory: allow VHT channels in world roaming	2013-03-06 16:36:05 +01:00
reg.h	regulatory: use RCU to protect global and wiphy regdomains	2013-01-03 13:01:29 +01:00
regdb.h	cfg80211: relicense reg.c reg.h and genregdb.awk to ISC	2012-01-04 14:30:41 -05:00
scan.c	cfg80211: always check for scan end on P2P device	2013-03-24 11:15:58 +01:00
sme.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
sysfs.c	cfg80211/mac80211: disconnect on suspend	2013-03-06 16:35:55 +01:00
sysfs.h
trace.c	cfg80211: add tracing to rdev-ops	2012-10-18 10:53:37 +02:00
trace.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-01 13:36:50 -04:00
util.c	net: add ETH_P_802_3_MIN	2013-03-28 01:20:42 -04:00
wext-compat.c	wext: explicitly cast -110 to u8	2012-12-07 11:58:26 +01:00
wext-compat.h	cfg80211: remove unused wext handler exports	2011-08-08 14:26:29 -04:00
wext-core.c	wext: include wireless event id when it has a size problem	2012-09-05 16:12:44 +02:00
wext-priv.c	wext: fix potential private ioctl memory content leak	2010-09-20 13:41:40 -04:00
wext-proc.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
wext-sme.c	cfg80211: always check for scan end on P2P device	2013-03-24 11:15:58 +01:00
wext-spy.c	wireless: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:19 -04:00