]> git.neil.brown.name Git - history.git/commit
Fix merge conflict.
authorDavid Mosberger <davidm@tiger.hpl.hp.com>
Fri, 23 Jan 2004 09:28:36 +0000 (01:28 -0800)
committerDavid Mosberger <davidm@tiger.hpl.hp.com>
Fri, 23 Jan 2004 09:28:36 +0000 (01:28 -0800)
commit6a9093cfd6a2a15321a92b73aa63058fc6a34b81
treebc87d9cd17943ab248799b79c35ba5b7c1ed2d35
parent672ab41e9381b6418cbdf17b39b51ffd64d07792
parenta0c17f063c261f498c5a7e74eb7eeb5cba889f1c
Fix merge conflict.
arch/ia64/Kconfig
arch/ia64/sn/kernel/sn2/Makefile
arch/ia64/sn/kernel/sn2/sn2_smp.c
include/asm-ia64/byteorder.h
include/asm-ia64/socket.h
include/asm-ia64/uaccess.h