]> git.hungrycats.org Git - linux/commitdiff
Merge http://kernel-acme.bkbits.net:8080/intermezzo-copy_tofrom_user-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Sat, 18 May 2002 15:26:30 +0000 (08:26 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sat, 18 May 2002 15:26:30 +0000 (08:26 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge