]> git.hungrycats.org Git - linux/commitdiff
Merge samba.org:/scratch/anton/linux-2.5
authorAnton Blanchard <anton@samba.org>
Tue, 5 Aug 2003 19:33:18 +0000 (05:33 +1000)
committerAnton Blanchard <anton@samba.org>
Tue, 5 Aug 2003 19:33:18 +0000 (05:33 +1000)
into samba.org:/scratch/anton/tmp3

1  2 
arch/ppc64/kernel/sys_ppc32.c

Simple merge