Merge samba.org:/scratch/anton/linux-2.5
authorAnton Blanchard <anton@samba.org>
Wed, 10 Apr 2002 20:45:14 +0000 (06:45 +1000)
committerAnton Blanchard <anton@samba.org>
Wed, 10 Apr 2002 20:45:14 +0000 (06:45 +1000)
commit3dd5a454ac03a7dfd1887a7df0c96363b3b58382
treecf9de72b54d0bc667bf07c7181e49fe675679ad0
parentf733206b9b300cd6baf20c2cf2b9f3ddecccf4cf
parent4f9af68104c7d8fb854c7f576eb0e1478e2fa9a7
Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/linux-2.5_ppc64