1
0
Fork 0
alistair23-linux/arch/i386/boot
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
..
compressed [PATCH] i386/x86-64: Consolidate arch/{i386,x86_64}/boot/compressed/misc.c 2006-06-26 10:48:18 -07:00
tools [PATCH] x86: gitignore some autogenerated files for i386 2006-02-14 16:09:35 -08:00
.gitignore [PATCH] x86: gitignore some autogenerated files for i386 2006-02-14 16:09:35 -08:00
Makefile [PATCH] i386/x86-64: Fix isoimage when syslinux is in /usr/share 2006-06-26 10:48:19 -07:00
bootsect.S [PATCH] CodingStyle: trivial whitespace fixups 2005-05-05 16:36:49 -07:00
edd.S [PATCH] Fix EDD to properly ignore signature of non-existing drives 2006-03-25 08:22:52 -08:00
install.sh kbuild: drop vmlinux dependency from "make install" 2006-01-09 20:36:48 +01:00
mtools.conf.in Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
setup.S [PATCH] Make the bzImage format self-terminating 2005-09-07 16:57:29 -07:00
video.S [PATCH] fbdev: Firmware EDID fixes 2006-06-26 09:58:30 -07:00