Merge pobox.com:/spare/repo/netdev-2.6/wireless-ext

into pobox.com:/spare/repo/net-drivers-2.6

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/wavelan.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/core/dev.c
Simple merge