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)
commit62d65a8062530a4b2673999deb9be368fa60ca87
tree89ccd9b8de02b247f145275311378280ae26cdfb
parentf89b23217372ed9bdba8804c1616d445402d1e05
parentea182d4aefa3a27847d890b1592a608d1180aa45
Merge branch 'upstream-fixes'
drivers/net/wireless/airo.c