]> git.neil.brown.name Git - history.git/commitdiff
Merge http://linux-isdn.bkbits.net/linux-2.5.net-auto_irq
authorJeff Garzik <jgarzik@mandrakesoft.com>
Tue, 30 Apr 2002 17:52:39 +0000 (13:52 -0400)
committerJeff Garzik <jgarzik@mandrakesoft.com>
Tue, 30 Apr 2002 17:52:39 +0000 (13:52 -0400)
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

1  2 
drivers/cdrom/sonycd535.c

Simple merge