]> git.neil.brown.name Git - history.git/commitdiff
Merge master.kernel.org:/home/axboe/BK/linux-2.5-ide
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 16 Aug 2002 03:23:41 +0000 (20:23 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 16 Aug 2002 03:23:41 +0000 (20:23 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge