fixed merge bug
authorMarc Fiuczynski <mef@cs.princeton.edu>
Fri, 28 Jan 2005 05:12:43 +0000 (05:12 +0000)
committerMarc Fiuczynski <mef@cs.princeton.edu>
Fri, 28 Jan 2005 05:12:43 +0000 (05:12 +0000)
commite9ba91f35ef8df437d40b76bd3cce5bbd8996abf
tree8f94c3f3e9000c6402c87549111fdf83ada31001
parenta3277795332eac2b562d2244307ade952ede7966
fixed merge bug
arch/i386/kernel/irq.c
arch/i386/kernel/vsyscall.lds.S