Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 09:51:26 +0000 (04:51 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 1 Dec 2005 09:51:26 +0000 (04:51 -0500)
1  2 
drivers/net/wireless/airo.c

Simple merge