]> git.hungrycats.org Git - linux/commitdiff
Merge pobox.com:/spare/repo/netdev-2.6/misc
authorJeff Garzik <jgarzik@pobox.com>
Wed, 14 Jul 2004 11:19:30 +0000 (07:19 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 14 Jul 2004 11:19:30 +0000 (07:19 -0400)
into pobox.com:/spare/repo/net-drivers-2.6

1  2 
drivers/net/wireless/airo.c

Simple merge