Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 5 Sep 2005 07:11:50 +0000 (00:11 -0700)]
1  2 
drivers/net/wireless/airo.c

Simple merge