]> git.hungrycats.org Git - linux/commitdiff
Merge samba.org:/scratch/anton/linux-2.5
authorAnton Blanchard <anton@samba.org>
Wed, 10 Sep 2003 15:52:19 +0000 (01:52 +1000)
committerAnton Blanchard <anton@samba.org>
Wed, 10 Sep 2003 15:52:19 +0000 (01:52 +1000)
into samba.org:/scratch/anton/tmp3

1  2 
arch/ppc64/Kconfig

Simple merge