David S. Miller 8b3f6af863 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h

2009-09-24 15:13:11 -07:00

..

chan.c

cfg80211: fix locking for SIWFREQ

2009-08-14 09:13:51 -04:00

core.c

cfg80211: clean up properly on interface type change

2009-08-28 14:40:31 -04:00

core.h

cfg80211: clean up properly on interface type change

2009-08-28 14:40:31 -04:00

debugfs.c

cfg80211: clean up naming once and for all

2009-07-10 15:02:33 -04:00

debugfs.h

cfg80211: clean up naming once and for all

2009-07-10 15:02:33 -04:00

ibss.c

cfg80211: make spurious warnings less likely, configurable

2009-08-28 14:40:30 -04:00

Kconfig

wireless: update cfg80211 kconfig entry

2009-09-08 16:31:06 -04:00

lib80211_crypt_ccmp.c

…

lib80211_crypt_tkip.c

…

lib80211_crypt_wep.c

…

lib80211.c

…

Makefile

cfg80211: validate channel settings across interfaces

2009-08-14 09:13:42 -04:00

mlme.c

cfg80211: report userspace SME connected event properly

2009-08-20 11:35:57 -04:00

nl80211.c

nl80211: jump to out_err upon unsupported iftype

2009-08-28 14:40:41 -04:00

nl80211.h

…

radiotap.c

…

reg.c

trivial: remove duplicate "different" from comment

2009-08-14 09:14:02 -04:00

reg.h

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-08-12 17:44:53 -07:00

scan.c

cfg80211: minimal error handling for wext-compat freq scanning

2009-09-23 11:35:39 -04:00

sme.c

cfg80211: fix SME connect

2009-09-23 11:35:43 -04:00

sysfs.c

…

sysfs.h

…

util.c

cfg80211: clean up properly on interface type change

2009-08-28 14:40:31 -04:00

wext-compat.c

trivial: remove unnecessary semicolons

2009-09-21 15:14:58 +02:00

wext-compat.h

cfg80211: validate channel settings across interfaces

2009-08-14 09:13:42 -04:00

wext-sme.c

cfg80211: don't overwrite privacy setting

2009-09-23 11:35:53 -04:00

wext.c

wext: remove extra return on wireless_nlevent_init()

2009-08-04 16:43:20 -04:00