Merge nanango.paulus.ozlabs.org:/home/paulus/kernel/linux-2.5
authorPaul Mackerras <paulus@nanango.paulus.ozlabs.org>
Thu, 9 May 2002 03:43:22 +0000 (13:43 +1000)
committerPaul Mackerras <paulus@nanango.paulus.ozlabs.org>
Thu, 9 May 2002 03:43:22 +0000 (13:43 +1000)
commitf300eb4259fd677570cf717b1e7a173d61c26fb5
tree0ed5fa5a198d5606a915bb2a33689a69b7c3a9b2
parent17bf6bcbe956e3dfaca67bded15118f389bd64f0
parent702d27c75ce9c624d4015ea61d1cec85e9d140a9
Merge nanango.paulus.ozlabs.org:/home/paulus/kernel/linux-2.5
into nanango.paulus.ozlabs.org:/home/paulus/kernel/for-linus-ppc
arch/ppc/config.in