David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
.gitignore	wireless: support internal statically compiled regulatory database	2009-12-21 18:56:10 -05:00
ap.c	cfg80211: add channel tracking for AP and mesh	2012-06-29 13:39:15 +02:00
chan.c	cfg80211: add P2P Device abstraction	2012-08-20 13:58:21 +02:00
core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-09-07 15:07:55 -04:00
core.h	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -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	cfg80211: Add framework to support ethtool stats.	2012-05-08 21:53:49 -04: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: respect iface combinations when starting operation	2012-06-29 13:39:19 +02:00
Kconfig	cfg80211: add CONFIG_CFG80211_CERTIFICATION_ONUS	2012-07-17 12:13:51 +02: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: introduce cfg80211_stop_ap	2012-06-29 13:39:14 +02:00
mesh.c	cfg80211: respect iface combinations when starting operation	2012-06-29 13:39:19 +02:00
mlme.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
nl80211.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-09-14 13:53:49 -04:00
nl80211.h	cfg80211: support TX error rate CQM	2012-07-17 11:57:23 +02:00
radiotap.c	wireless: add radiotap A-MPDU status field	2012-08-20 13:53:09 +02:00
reg.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
reg.h	cfg80211: make regulatory_update() static	2012-07-17 12:16:40 +02: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: fix indentation	2012-09-05 16:54:05 +02:00
sme.c	nl80211: move scan API to wdev	2012-07-12 12:10:41 +02:00
sysfs.c	mac80211: fix suspend/resume races with unregister hw	2011-08-22 14:21:40 -04:00
sysfs.h	[WIRELESS] cfg80211: New wireless config infrastructure.	2007-04-25 22:29:41 -07:00
util.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-09-07 15:07:55 -04:00
wext-compat.c	cfg80211/mac80211: re-add get_channel operation	2012-07-13 16:16:11 +02: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: spread __net_init, __net_exit	2010-01-17 19:16:02 -08:00
wext-sme.c	cfg80211: clarify set_channel APIs	2012-06-06 15:18:17 -04:00
wext-spy.c	wireless: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:19 -04:00