Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
<jgarzik@pretzel.yyz.us> [Sat, 28 May 2005 02:02:58 +0000 (22:02 -0400)]
1  2 
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile

Simple merge
Simple merge