David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c

2011-11-21 13:50:33 -05:00

..

.gitignore

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

chan.c

cfg80211: fix can_beacon_sec_chan, reenable HT40

2010-11-18 11:35:05 -05:00

core.c

nl80211: advertise device AP SME

2011-11-09 16:12:38 -05:00

core.h

cfg80211/mac80211: allow management TX to not wait for ACK

2011-11-09 16:13:54 -05:00

db.txt

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

debugfs.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

debugfs.h

cfg80211/mac80211: use debugfs_remove_recursive

2009-10-30 16:49:18 -04:00

ethtool.c

wireless: add support for ethtool_ops->{get,set}_ringparam

2011-03-11 14:16:58 -05:00

ethtool.h

net/wireless/ethtool.h: drop unnecessary include of linux/ethtool.h

2009-10-07 16:39:49 -04:00

genregdb.awk

wireless: correct sparse warning in generated regdb.c

2010-07-20 16:49:37 -04:00

ibss.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

Kconfig

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-20 17:02:05 -08:00

lib80211_crypt_ccmp.c

wireless: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

lib80211_crypt_tkip.c

wireless: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -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/mac80211: add mesh join/leave commands

2010-12-06 16:01:29 -05:00

mesh.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

mlme.c

cfg80211/mac80211: allow management TX to not wait for ACK

2011-11-09 16:13:54 -05:00

nl80211.c

nl80211: Pass probe response data to drivers

2011-11-11 12:32:51 -05:00

nl80211.h

cfg80211: add event for unexpected 4addr frames

2011-11-09 16:13:52 -05:00

radiotap.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

reg.c

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

2011-11-11 11:34:47 -05:00

reg.h

cfg80211: hold reg_mutex when updating regulatory

2011-09-14 13:26:39 -04:00

regdb.h

wireless: support internal statically compiled regulatory database

2009-12-21 18:56:10 -05:00

scan.c

cfg80211: merge in beacon ies of hidden bss.

2011-11-11 12:32:47 -05:00

sme.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

sysfs.c

mac80211: fix suspend/resume races with unregister hw

2011-08-22 14:21:40 -04:00

sysfs.h

…

util.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

wext-compat.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2011-11-17 13:11:43 -05:00

wext-compat.h

cfg80211: remove unused wext handler exports

2011-08-08 14:26:29 -04:00

wext-core.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04: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

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

wext-spy.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00