]> git.hungrycats.org Git - linux/commitdiff
Merge samba.org:/scratch/anton/linux-2.5
authorAnton Blanchard <anton@samba.org>
Wed, 1 May 2002 22:11:25 +0000 (08:11 +1000)
committerAnton Blanchard <anton@samba.org>
Wed, 1 May 2002 22:11:25 +0000 (08:11 +1000)
into samba.org:/scratch/anton/linux-2.5_ppc64

1  2 
arch/ppc64/mm/init.c

Simple merge