kernel-ark/include/asm-ia64
Linus Torvalds 81a07d7588 Merge branch 'x86-64'
* x86-64: (83 commits)
  [PATCH] x86_64: x86_64 stack usage debugging
  [PATCH] x86_64: (resend) x86_64 stack overflow debugging
  [PATCH] x86_64: msi_apic.c build fix
  [PATCH] x86_64: i386/x86-64 Add nmi watchdog support for new Intel CPUs
  [PATCH] x86_64: Avoid broadcasting NMI IPIs
  [PATCH] x86_64: fix apic error on bootup
  [PATCH] x86_64: enlarge window for stack growth
  [PATCH] x86_64: Minor string functions optimizations
  [PATCH] x86_64: Move export symbols to their C functions
  [PATCH] x86_64: Standardize i386/x86_64 handling of NMI_VECTOR
  [PATCH] x86_64: Fix modular pc speaker
  [PATCH] x86_64: remove sys32_ni_syscall()
  [PATCH] x86_64: Do not use -ffunction-sections for modules
  [PATCH] x86_64: Add cpu_relax to apic_wait_icr_idle
  [PATCH] x86_64: adjust kstack_depth_to_print default
  [PATCH] i386/x86-64: adjust /proc/interrupts column headings
  [PATCH] x86_64: Fix race in cpu_local_* on preemptible kernels
  [PATCH] x86_64: Fix fast check in safe_smp_processor_id
  [PATCH] x86_64: x86_64 setup.c - printing cmp related boottime information
  [PATCH] i386/x86-64/ia64: Move polling flag into thread_info_status
  ...

Manual resolve of trivial conflict in arch/i386/kernel/Makefile
2006-06-26 10:51:09 -07:00
..
sn
a.out.h
acpi-ext.h
acpi.h
agp.h
asmmacro.h
atomic.h
auxvec.h
bitops.h
break.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
checksum.h
compat.h
cpu.h
cputime.h
current.h
cyclone.h
delay.h
div64.h
dma-mapping.h
dma.h
dmi.h
elf.h
emergency-restart.h
errno.h
fcntl.h
fpswa.h
fpu.h
futex.h
gcc_intrin.h
hardirq.h
hw_irq.h
ia32.h
ia64regs.h
ide.h
intel_intrin.h
intrinsics.h
io.h
ioctl.h
ioctls.h
iosapic.h
ipcbuf.h
irq.h
kdebug.h
kmap_types.h
kprobes.h
kregs.h
linkage.h
local.h
machvec_dig.h
machvec_hpsim.h
machvec_hpzx1_swiotlb.h
machvec_hpzx1.h
machvec_init.h
machvec_sn2.h
machvec.h
mc146818rtc.h
mca_asm.h
mca.h
meminit.h
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h
msgbuf.h
msi.h
mutex.h
namei.h
nodedata.h
numa.h
page.h
pal.h
param.h
parport.h
patch.h
pci.h
percpu.h
perfmon_default_smpl.h
perfmon.h
pgalloc.h
pgtable.h
poll.h
posix_types.h
processor.h
ptrace_offsets.h
ptrace.h
resource.h
rse.h
rwsem.h
sal.h
scatterlist.h
sections.h
segment.h
semaphore.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
socket.h
sockios.h
sparsemem.h
spinlock_types.h
spinlock.h
stat.h
statfs.h
string.h
suspend.h
system.h
termbits.h
termios.h
thread_info.h
timex.h
tlb.h
tlbflush.h
topology.h
types.h
uaccess.h
ucontext.h
unaligned.h
uncached.h
unistd.h
unwind.h
user.h
ustack.h
vga.h
xor.h