]> git.hungrycats.org Git - linux/commitdiff
Merge samba.org:/scratch/anton/sfr
authorAnton Blanchard <anton@samba.org>
Sun, 16 Mar 2003 16:26:01 +0000 (03:26 +1100)
committerAnton Blanchard <anton@samba.org>
Sun, 16 Mar 2003 16:26:01 +0000 (03:26 +1100)
into samba.org:/scratch/anton/linux-2.5_ppc64

1  2 
arch/ppc64/kernel/sys_ppc32.c

Simple merge