David S. Miller 730c30ec64 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c

2008-12-05 22:54:40 -08:00

..

aes_ccm.c

…

aes_ccm.h

…

cfg.c

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

cfg.h

…

debugfs_key.c

…

debugfs_key.h

…

debugfs_netdev.c

…

debugfs_netdev.h

…

debugfs_sta.c

…

debugfs_sta.h

…

debugfs.c

…

debugfs.h

…

event.c

…

ht.c

…

ieee80211_i.h

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

iface.c

cfg80211: handle SIOCGIWMODE/SIOCSIWMODE

2008-12-05 09:32:58 -05:00

Kconfig

…

key.c

…

key.h

…

led.c

…

led.h

…

main.c

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

Makefile

…

mesh_hwmp.c

…

mesh_pathtbl.c

…

mesh_plink.c

…

mesh.c

…

mesh.h

…

michael.c

…

michael.h

…

mlme.c

mac80211: accept empty strings for hidden SSIDs

2008-12-05 09:32:59 -05:00

rate.c

…

rate.h

…

rc80211_minstrel_debugfs.c

…

rc80211_minstrel.c

…

rc80211_minstrel.h

…

rc80211_pid_algo.c

…

rc80211_pid_debugfs.c

…

rc80211_pid.h

…

rx.c

mac80211: add sta_notify_ps callback

2008-12-05 09:35:43 -05:00

scan.c

…

spectmgmt.c

…

sta_info.c

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

2008-12-05 22:54:40 -08:00

sta_info.h

…

tkip.c

…

tkip.h

…

tx.c

mac80211: tx module cleanup.

2008-12-05 09:35:46 -05:00

util.c

nl80211: Add frequency configuration (including HT40)

2008-12-05 09:32:11 -05:00

wep.c

…

wep.h

…

wext.c

cfg80211: handle SIOCGIWMODE/SIOCSIWMODE

2008-12-05 09:32:58 -05:00

wme.c

…

wme.h

…

wpa.c

…

wpa.h

…