H. Peter Anvin 7203781c98 Merge branch 'x86/cpu' into x86/core ... Conflicts: arch/x86/kernel/cpu/feature_names.c include/asm-x86/cpufeature.h		2008-09-04 08:08:42 -07:00
..
bigsmp	x86: mach-bigsmp to bigsmp	2008-07-26 16:31:34 +02:00
es7000	x86: mach_es7000 to es7000	2008-07-26 16:31:34 +02:00
mach-default	Merge branch 'x86/x2apic' into x86/core	2008-07-26 16:29:23 +02:00
mach-generic	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mach-rdc321x	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mach-voyager	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
numaq	x86: mach-numaq to numaq	2008-07-26 16:31:35 +02:00
summit	x86: mach_summit to summit	2008-07-26 16:31:35 +02:00
uv	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
visws	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
xen	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
a.out-core.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
a.out.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
acpi.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
agp.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
alternative-asm.h
alternative.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
amd_iommu_types.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
amd_iommu.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
apic.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
apicdef.h	Merge branch 'x86/x2apic' into x86/core	2008-07-26 16:29:23 +02:00
arch_hooks.h	x86: apic interrupts - move assignments to irqinit_32.c, v2	2008-08-11 16:43:09 +02:00
asm.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
atomic_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
atomic_64.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
atomic.h
auxvec.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
bios_ebda.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
bitops.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
boot.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
bootparam.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
bug.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
bugs.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
byteorder.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
cache.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
cacheflush.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
calgary.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
calling.h	x86 ptrace: unify syscall tracing	2008-07-16 12:15:17 -07:00
checksum_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
checksum_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
checksum.h
cmpxchg_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
cmpxchg_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
cmpxchg.h
compat.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
cpu.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
cpufeature.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
cputime.h
current.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
debugreg.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
delay.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
desc_defs.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
desc.h	x86: consolidate header guards	2008-07-22 21:53:53 +02:00
device.h	Merge commit 'v2.6.27-rc1' into x86/core	2008-07-30 19:33:48 +02:00
div64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
dma-mapping.h	Merge commit 'v2.6.27-rc1' into x86/core	2008-07-30 19:33:48 +02:00
dma.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
dmi.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
ds.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
dwarf2.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
e820.h	x86, e820: add support for AddressRangeUnusuable ACPI memory type	2008-08-21 13:22:13 +02:00
edac.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
efi.h	Merge branch 'linus' into x86/core	2008-08-14 14:58:01 +02:00
elf.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
emergency-restart.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
errno.h
fb.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
fcntl.h
fixmap_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
fixmap_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
fixmap.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
floppy.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
frame.h
ftrace.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
futex.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
gart.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
genapic_32.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
genapic_64.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
genapic.h
geode.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
gpio.h	Merge branch 'x86/urgent' into x86/core	2008-07-26 16:30:19 +02:00
hardirq_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
hardirq_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
hardirq.h
highmem.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
hpet.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
hugetlb.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
hw_irq.h	Merge branch 'x86/apic' into x86/core	2008-08-14 15:13:47 +02:00
hypertransport.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
i387.h	Merge branch 'x86/amd-iommu' into x86/urgent	2008-08-15 13:57:32 +02:00
i8253.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
i8259.h	Merge branch 'x86/x2apic' into x86/core	2008-07-26 16:29:23 +02:00
ia32_unistd.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
ia32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
idle.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
intel_arch_perfmon.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
io_32.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
io_64.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
io_apic.h	Merge branch 'x86/x2apic' into x86/core	2008-07-26 16:29:23 +02:00
io.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
ioctl.h
ioctls.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
iommu.h	Merge branch 'linus' into x86/core	2008-08-14 14:58:01 +02:00
ipcbuf.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
ipi.h	Merge branch 'x86/x2apic' into x86/core	2008-07-26 16:29:23 +02:00
irq_regs_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
irq_regs_64.h
irq_regs.h
irq_remapping.h	x64, x2apic/intr-remap: IO-APIC support for interrupt-remapping	2008-07-12 08:45:05 +02:00
irq_vectors.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
irq.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
irqflags.h	Merge branch 'auto-ftrace-next' into tracing/for-linus	2008-07-14 16:11:52 +02:00
ist.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
k8.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
Kbuild	Merge git://git.infradead.org/~dwmw2/random-2.6	2008-07-25 12:01:37 -07:00
kdebug.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
kexec.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
kgdb.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
kmap_types.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
kprobes.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
kvm_host.h	Merge branch 'linus' into x86/core	2008-08-14 14:58:01 +02:00
kvm_para.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
kvm_x86_emulate.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
kvm.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
ldt.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
lguest_hcall.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
lguest.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
linkage.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
local.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
math_emu.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mc146818rtc.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mca_dma.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mca.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mce.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
mman.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
mmconfig.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
mmu_context_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mmu_context_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mmu_context.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mmu.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mmx.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mmzone_32.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
mmzone_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mmzone.h
module.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mpspec_def.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mpspec.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
msgbuf.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
msidef.h	Merge branch 'x86/x2apic' into x86/core	2008-07-26 16:29:23 +02:00
msr-index.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
msr.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
mtrr.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mutex_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mutex_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
mutex.h
nmi.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
nops.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
numa_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
numa_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
numa.h
numaq.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
olpc.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
page_32.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
page_64.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
page.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
param.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
paravirt.h	Merge branch 'x86/x2apic' into x86/core	2008-07-26 16:29:23 +02:00
parport.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pat.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pci_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pci_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pci-direct.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pci.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pda.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
percpu.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
pgalloc.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pgtable_32.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
pgtable_64.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
pgtable-2level-defs.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pgtable-2level.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pgtable-3level-defs.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pgtable-3level.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
pgtable.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
poll.h
posix_types_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
posix_types_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
posix_types.h
prctl.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
processor-cyrix.h	x86, cyrix: debug	2008-07-22 12:24:00 +02:00
processor-flags.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
processor.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
proto.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
ptrace-abi.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
ptrace.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
pvclock-abi.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
pvclock.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
reboot_fixups.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
reboot.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
required-features.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
resource.h
resume-trace.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
rio.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
rtc.h
rwlock.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
rwsem.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
scatterlist.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
seccomp_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
seccomp_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
seccomp.h
sections.h
segment.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
sembuf.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
serial.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
setup.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
shmbuf.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
shmparam.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
sigcontext32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
sigcontext.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
siginfo.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
signal.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
smp.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
socket.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
sockios.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
sparsemem.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
spinlock_types.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
spinlock.h	Merge branch 'x86/cpu' into x86/core	2008-09-04 08:08:42 -07:00
srat.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
stacktrace.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
stat.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
statfs.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
string_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
string_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
string.h
suspend_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
suspend_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
suspend.h
swiotlb.h	Merge commit 'v2.6.27-rc1' into x86/core	2008-07-30 19:33:48 +02:00
sync_bitops.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
syscalls.h	x86_64: Declare new_utsname in asm-x86/syscalls.h	2008-07-25 09:19:05 +05:30
system_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
system.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
tce.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
termbits.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
termios.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
therm_throt.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
thread_info.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
time.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
timer.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
timex.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
tlb.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
tlbflush.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
topology.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
trampoline.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
traps.h	Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core	2008-08-14 14:58:22 +02:00
tsc.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
types.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
uaccess_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
uaccess_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
uaccess.h	Merge commit 'v2.6.27-rc1' into x86/core	2008-07-30 19:33:48 +02:00
ucontext.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
unaligned.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
unistd_32.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
unistd_64.h	Merge branch 'linus' into x86/header-guards	2008-07-26 15:30:40 +02:00
unistd.h
unwind.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
user32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
user_32.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
user_64.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
user.h
vdso.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
vga.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
vgtod.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
vic.h
vm86.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
vmi_time.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
vmi.h
voyager.h
vsyscall.h	x86: consolidate header guards	2008-07-22 21:31:34 +02:00
xor_32.h
xor_64.h
xor.h