linux/drivers
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
..
acorn
acpi Merge branch 'x86-64' 2006-06-26 10:51:09 -07:00
amba
atm
base
block
bluetooth
cdrom
char Merge branch 'x86-64' 2006-06-26 10:51:09 -07:00
clocksource
connector
cpufreq
crypto
dio
dma
edac
eisa
fc4
firmware
hwmon
i2c
ide
ieee1394
infiniband
input
isdn
leds
macintosh
mca
md [PATCH] drivers/md/md.c: make code static 2006-06-26 09:58:40 -07:00
media
message
mfd
misc
mmc
mtd
net Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2006-06-26 10:08:13 -07:00
nubus
oprofile
parisc
parport
pci [PATCH] x86_64: msi_apic.c build fix 2006-06-26 10:48:22 -07:00
pcmcia
pnp
rapidio
rtc
s390
sbus
scsi Merge branch 'x86-64' 2006-06-26 10:51:09 -07:00
serial
sh
sn
spi
tc
telephony
usb
video [PATCH] VT binding: Make sticon support binding 2006-06-26 09:58:34 -07:00
w1
zorro
Kconfig
Makefile