Automatic merge of /spare/repo/netdev-2.6 branch we18-ieee80211
author <jgarzik@pretzel.yyz.us>
Sat, 28 May 2005 02:02:58 +0000 (22:02 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 May 2005 02:02:58 +0000 (22:02 -0400)
commit6cd15a9daf826115356f9403494c76e5aafa7793
tree3ab9372fca7974dcb4c3c25fa5dc6f267cddeef9
parentff1d2767d5a43c85f944e86a45284b721f66196c
parent43f66a6ce8da299344cf1bc2ac2311889cc88555
Merge ... /spare/repo/netdev-2.6 branch we18-ieee80211
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile