]> git.hungrycats.org Git - linux/commitdiff
Merge tango.paulus.ozlabs.org:/home/paulus/kernel/linux-2.5
authorPaul Mackerras <paulus@tango.paulus.ozlabs.org>
Fri, 15 Feb 2002 05:23:15 +0000 (16:23 +1100)
committerPaul Mackerras <paulus@tango.paulus.ozlabs.org>
Fri, 15 Feb 2002 05:23:15 +0000 (16:23 +1100)
into tango.paulus.ozlabs.org:/home/paulus/kernel/linuxppc-2.5

1  2 
arch/ppc/kernel/signal.c

Simple merge