]> git.hungrycats.org Git - linux/commitdiff
resolve conflicts
authorAnton Blanchard <anton@samba.org>
Sun, 9 Feb 2003 10:51:36 +0000 (21:51 +1100)
committerAnton Blanchard <anton@samba.org>
Sun, 9 Feb 2003 10:51:36 +0000 (21:51 +1100)
1  2 
arch/ppc64/kernel/signal.c
arch/ppc64/kernel/signal32.c
include/asm-ppc64/system.h

Simple merge
Simple merge
Simple merge