Preston_PLB/kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a9ad965ea9
kernel-aes67/include/asm-i386/mach-default
History
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
..
apm.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
bios_ebda.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
do_timer.h [PATCH] i386: fix uses of user_mode() vs. user_mode_vm() 2006-03-23 07:38:05 -08:00
entry_arch.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
io_ports.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
irq_vectors_limits.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
irq_vectors.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mach_apic.h [PATCH] Do not enforce unique IO_APIC_ID check for xAPIC systems (i386) 2005-06-23 09:45:09 -07:00
mach_apicdef.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mach_ipi.h [PATCH] x86_64: Avoid broadcasting NMI IPIs 2006-06-26 10:48:22 -07:00
mach_mpparse.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mach_mpspec.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mach_reboot.h [PATCH] x86_64: Reduce number of retries for reset through keyboard controller 2005-11-14 19:55:16 -08:00
mach_time.h [PATCH] RTC: Fix up some RTC whitespace and style 2006-03-28 09:16:01 -08:00
mach_timer.h [PATCH] Time: i386 Conversion - part 2: Rework TSC Support 2006-06-26 09:58:21 -07:00
mach_traps.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mach_wakecpu.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pci-functions.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
setup_arch.h [PATCH] Clean up and refactor i386 sub-architecture setup 2006-06-25 10:00:55 -07:00
smpboot_hooks.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00