David S. Miller 2d6a5e9500 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/igb/igb_main.c drivers/net/qlge/qlge_main.c drivers/net/wireless/ath9k/ath9k.h drivers/net/wireless/ath9k/core.h drivers/net/wireless/ath9k/hw.c		2009-03-17 15:01:30 -07:00
..
core.c	cfg80211: Add AP beacon regulatory hints	2009-02-27 14:52:59 -05:00
core.h	nl80211: Avoid AP mode BUG_ON hang with invalid lock assert	2009-02-27 14:53:04 -05:00
Kconfig	lib80211: silence excessive crypto debugging messages	2009-03-16 18:01:58 -04:00
lib80211_crypt_ccmp.c	lib80211: silence excessive crypto debugging messages	2009-03-16 18:01:58 -04:00
lib80211_crypt_tkip.c	lib80211: silence excessive crypto debugging messages	2009-03-16 18:01:58 -04:00
lib80211_crypt_wep.c	lib80211: absorb crypto bits from net/ieee80211	2008-11-21 11:08:17 -05:00
lib80211.c	lib80211: consolidate crypt init routines	2008-11-21 11:08:17 -05:00
Makefile	cfg80211/nl80211: scanning (and mac80211 update to use it)	2009-02-13 13:45:49 -05:00
nl80211.c	nl80211: Avoid AP mode BUG_ON hang with invalid lock assert	2009-02-27 14:53:04 -05:00
nl80211.h	wireless: fix for CONFIG_NL80211=n	2009-02-27 14:52:35 -05:00
radiotap.c	wireless: use get/put_unaligned_* helpers	2008-05-14 16:29:32 -04:00
reg.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-03-10 05:04:16 -07:00
reg.h	cfg80211: make __regulatory_hint() static	2009-02-27 14:52:59 -05:00
scan.c	cfg80211: Add AP beacon regulatory hints	2009-02-27 14:52:59 -05:00
sysfs.c	cfg80211: rename cfg80211_registered_device's idx to wiphy_idx	2009-02-27 14:52:54 -05:00
sysfs.h
util.c	wireless: restrict to 32 legacy rates	2009-01-29 16:01:09 -05:00
wext-compat.c	mac80211/cfg80211: move iwrange handler to cfg80211	2009-02-27 14:52:42 -05:00
wext.c	wireless: convert wireless ioctl to net_device_ops	2009-01-06 10:42:24 -08:00