]> git.hungrycats.org Git - linux/commitdiff
Merge http://linux-isdn.bkbits.net/linux-2.5.make
authorLinus Torvalds <torvalds@home.transmeta.com>
Sat, 8 Jun 2002 09:14:23 +0000 (02:14 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sat, 8 Jun 2002 09:14:23 +0000 (02:14 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
drivers/video/Makefile

Simple merge