]> git.neil.brown.name Git - history.git/commit
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)
commit5454267b5bea331ba3ffb59ea1a38e59a4fcd971
treeb2f9440480ee0b0d15cc26459889db292a1fb873
parent6d4c02fa9f1b6a0e1ce07c5a8973ad86d29a62b1
parent03e218313940d2948c2b72df2710e193e42acca5
resolve conflicts
arch/ppc64/kernel/signal.c
arch/ppc64/kernel/signal32.c
include/asm-ppc64/system.h