David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
.gitignore	…
Kconfig	…
Makefile	…
ap.c	…
chan.c	cfg80211: check no-OFDM flag for channels wider than 20 MHz	2012-12-04 20:51:27 +01:00
core.c	net, wireless: overwrite default_ethtool_ops	2013-01-11 15:55:48 -08:00
core.h	cfg80211: fix BSS struct IE access races	2012-11-30 13:42:20 +01:00
db.txt	…
debugfs.c	…
debugfs.h	…
ethtool.c	ethtool: fix drvinfo strings set in drivers	2013-01-06 21:06:31 -08:00
ethtool.h	…
genregdb.awk	…
ibss.c	nl80211/cfg80211: support VHT channel configuration	2012-11-26 12:42:59 +01:00
lib80211.c	…
lib80211_crypt_ccmp.c	…
lib80211_crypt_tkip.c	…
lib80211_crypt_wep.c	…
mesh.c	cfg80211: fix channel error on mesh join	2012-12-03 11:24:49 +01:00
mlme.c	…
nl80211.c	cfg80211: fix BSS struct IE access races	2012-11-30 13:42:20 +01:00
nl80211.h	…
radiotap.c	…
rdev-ops.h	…
reg.c	CONFIG_HOTPLUG removal from networking core	2012-12-22 00:03:00 -08:00
reg.h	cfg80211: fix BSS struct IE access races	2012-11-30 13:42:20 +01:00
regdb.h	…
scan.c	cfg80211: fix BSS struct IE access races	2012-11-30 13:42:20 +01:00
sme.c	cfg80211: fix BSS struct IE access races	2012-11-30 13:42:20 +01:00
sysfs.c	CONFIG_HOTPLUG removal from networking core	2012-12-22 00:03:00 -08:00
sysfs.h	…
trace.c	…
trace.h	cfg80211: fix some tracing output issues	2012-11-26 12:48:17 +01:00
util.c	cfg80211: fix BSS struct IE access races	2012-11-30 13:42:20 +01:00
wext-compat.c	wext: explicitly cast -110 to u8	2012-12-07 11:58:26 +01:00
wext-compat.h	…
wext-core.c	…
wext-priv.c	…
wext-proc.c	…
wext-sme.c	cfg80211: fix BSS struct IE access races	2012-11-30 13:42:20 +01:00
wext-spy.c	…