]> git.neil.brown.name Git - history.git/commitdiff
Merge http://gkernel.bkbits.net/net-drivers-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:27:30 +0000 (20:27 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 1 May 2002 03:27:30 +0000 (20:27 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/cdrom/sonycd535.c

Simple merge