Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Mar 2010 01:15:15 +0000 (18:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Mar 2010 01:15:15 +0000 (18:15 -0700)
commit33e2bf6aa16061bae1253514e7c32af27d2b4b31
tree652d13b4feea9a8f562186e7badae72d2e22fe1f
parente880eb6c5c9d98e389ffc0d8947f75d70785361a
parent819bfecc4fc6b6e5a793f719a45b7146ce423b79
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
16 files changed:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath5k/reg.h
drivers/net/wireless/ath/ath5k/reset.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/libipw.h
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwmc3200wifi/debugfs.c
drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/rndis_wlan.c