]> git.hungrycats.org Git - linux/commitdiff
Merge home.transmeta.com:/home/torvalds/v2.5/akpm
authorLinus Torvalds <torvalds@home.transmeta.com>
Sun, 20 Apr 2003 07:47:49 +0000 (00:47 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sun, 20 Apr 2003 07:47:49 +0000 (00:47 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
arch/i386/kernel/time.c

Simple merge