Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
author <jgarzik@pretzel.yyz.us> <>
Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 May 2005 02:08:07 +0000 (22:08 -0400)
commit51a730d758ae4052e10ca7e06336f10af598c4fc
treeb76a004c00cd7139659be515ee03398e47067290
parent6cd15a9daf826115356f9403494c76e5aafa7793
parentff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf
Merge ... /spare/repo/netdev-2.6 branch we18-ieee80211
drivers/net/wireless/Kconfig
drivers/net/wireless/airo.c