]> git.hungrycats.org Git - linux/commitdiff
Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5
authorJeff Garzik <jgarzik@mandrakesoft.com>
Fri, 20 Sep 2002 19:16:36 +0000 (15:16 -0400)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Fri, 20 Sep 2002 19:16:36 +0000 (15:16 -0400)
into mandrakesoft.com:/home/jgarzik/repo/irda-2.5


Trivial merge