Ingo Molnar cb28a1bbdb Merge branch 'linus' into core/generic-dma-coherent ... Conflicts: arch/x86/Kconfig Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-29 00:07:55 +02:00
..
mach-bigsmp	x86: APIC: remove apic_write_around(); use alternatives	2008-07-18 12:51:21 +02:00
mach-default	x86: convert Dprintk to pr_debug	2008-07-21 21:35:38 +02:00
mach-es7000	x86: APIC: remove apic_write_around(); use alternatives	2008-07-18 12:51:21 +02:00
mach-generic	x86: extend and use x86_quirks to clean up NUMAQ code	2008-07-20 09:25:52 +02:00
mach-numaq
mach-rdc321x
mach-summit	x86: fix IBM Summit based systems' phys_cpu_present_map on 32-bit kernels	2008-07-26 14:58:39 +02:00
mach-voyager	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
uv	x86 BIOS interface for RTC on SGI UV	2008-07-18 14:35:14 +02:00
visws
xen	x86: rename PTE_MASK to PTE_PFN_MASK	2008-07-22 10:43:44 +02:00
a.out-core.h
a.out.h
acpi.h
agp.h
alternative-asm.h
alternative.h
amd_iommu_types.h
amd_iommu.h
apic.h	x86: convert Dprintk to pr_debug	2008-07-21 21:35:38 +02:00
apicdef.h
arch_hooks.h	x86: add ->pre_time_init to x86_quirks	2008-07-20 09:25:52 +02:00
asm.h
atomic_32.h
atomic_64.h
atomic.h
auxvec.h
bios_ebda.h
bitops.h	x86, cleanup: fix description of __fls(): __fls(0) is undefined	2008-07-18 14:32:38 +02:00
boot.h
bootparam.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
calgary.h
calling.h	x86 ptrace: unify syscall tracing	2008-07-16 12:15:17 -07:00
checksum_32.h
checksum_64.h
checksum.h
cmpxchg_32.h
cmpxchg_64.h
cmpxchg.h
compat.h
cpu.h
cpufeature.h	x86: APIC: remove apic_write_around(); use alternatives	2008-07-18 12:51:21 +02:00
cputime.h
current.h
debugreg.h
delay.h
desc_defs.h
desc.h	Merge commit 'v2.6.26' into x86/core	2008-07-14 11:37:46 +02:00
device.h	dma-mapping: add the device argument to dma_mapping_error()	2008-07-26 12:00:03 -07:00
div64.h
dma-mapping.h	Merge branch 'linus' into core/generic-dma-coherent	2008-07-29 00:07:55 +02:00
dma.h
dmi.h
ds.h
dwarf2.h	x86: Fix compile error with CONFIG_AS_CFI=n	2008-07-15 15:30:29 +02:00
e820.h	x86: seperate memtest from init_64.c	2008-07-18 14:10:27 +02:00
edac.h
efi.h
elf.h
emergency-restart.h
errno.h
fb.h
fcntl.h
fixmap_32.h	x86: i386: reduce boot fixmap space	2008-07-18 16:17:52 -07:00
fixmap_64.h	x86: make 64bit hpet_set_mapping to use ioremap too, v2	2008-07-14 09:24:17 +02:00
fixmap.h
floppy.h
frame.h
ftrace.h	ftrace: copy + paste typo in asm/ftrace.h	2008-07-18 13:14:08 +02:00
futex.h
gart.h
genapic_32.h	x86: I/O APIC: remove an IRQ2-mask hack	2008-07-13 11:43:48 +02:00
genapic_64.h	x86: I/O APIC: remove an IRQ2-mask hack	2008-07-13 11:43:48 +02:00
genapic.h
geode.h
gpio.h	x86, RDC321x: remove gpio.h complications	2008-07-26 14:50:51 +02:00
hardirq_32.h
hardirq_64.h
hardirq.h
highmem.h
hpet.h
hugetlb.h	hugetlb: modular state for hugetlb page size	2008-07-24 10:47:17 -07:00
hw_irq.h	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
hypertransport.h
i387.h	x86-64: Clean up 'save/restore_i387()' usage	2008-07-24 16:12:40 -07:00
i8253.h
i8259.h
ia32_unistd.h
ia32.h
idle.h
intel_arch_perfmon.h
io_32.h	access_process_vm device memory infrastructure	2008-07-24 10:47:15 -07:00
io_64.h	access_process_vm device memory infrastructure	2008-07-24 10:47:15 -07:00
io_apic.h
io.h
ioctl.h
ioctls.h
iommu.h	x86 calgary: fix handling of devices that aren't behind the Calgary	2008-07-26 12:00:03 -07:00
ipcbuf.h
ipi.h	Merge branch 'linus' into cpus4096	2008-07-16 00:29:07 +02:00
irq_regs_32.h
irq_regs_64.h
irq_regs.h
irq_vectors.h	Merge branch 'generic-ipi' into generic-ipi-for-linus	2008-07-15 21:55:59 +02:00
irq.h
irqflags.h	Merge branch 'auto-ftrace-next' into tracing/for-linus	2008-07-14 16:11:52 +02:00
ist.h
k8.h
Kbuild	Merge git://git.infradead.org/~dwmw2/random-2.6	2008-07-25 12:01:37 -07:00
kdebug.h
kexec.h	kexec jump	2008-07-26 12:00:04 -07:00
kgdb.h
kmap_types.h
kprobes.h
kvm_host.h	KVM: SVM: allow enabling/disabling NPT by reloading only the architecture module	2008-07-27 11:34:09 +03:00
kvm_para.h
kvm_x86_emulate.h	KVM: x86 emulator: lazily evaluate segment registers	2008-07-20 12:42:35 +03:00
kvm.h	KVM: SVM: add tracing support for TDP page faults	2008-07-20 12:40:48 +03:00
ldt.h
lguest_hcall.h
lguest.h
linkage.h
local.h
math_emu.h
mc146818rtc.h
mca_dma.h
mca.h
mce.h
mman.h
mmconfig.h
mmu_context_32.h
mmu_context_64.h
mmu_context.h
mmu.h
mmx.h
mmzone_32.h
mmzone_64.h
mmzone.h
module.h
mpspec_def.h
mpspec.h
msgbuf.h
msidef.h
msr-index.h
msr.h
mtrr.h
mutex_32.h
mutex_64.h
mutex.h
nmi.h
nops.h
numa_32.h
numa_64.h
numa.h
numaq.h	x86: fix numaq_tsc_disable calling	2008-07-13 08:19:45 +02:00
olpc.h
page_32.h
page_64.h
page.h	PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures	2008-07-24 10:47:21 -07:00
param.h
paravirt.h	x86: rename PTE_MASK to PTE_PFN_MASK	2008-07-22 10:43:44 +02:00
parport.h
pat.h
pci_32.h
pci_64.h
pci-direct.h
pci.h
pda.h
percpu.h	x86_64: add workaround for no %gs-based percpu	2008-07-16 10:58:13 +02:00
pgalloc.h
pgtable_32.h	x86: add PTE_FLAGS_MASK	2008-07-22 10:43:45 +02:00
pgtable_64.h	x86: rename PTE_MASK to PTE_PFN_MASK	2008-07-22 10:43:44 +02:00
pgtable-2level-defs.h
pgtable-2level.h
pgtable-3level-defs.h
pgtable-3level.h	x86: rename PTE_MASK to PTE_PFN_MASK	2008-07-22 10:43:44 +02:00
pgtable.h	x86: implement pte_special	2008-07-26 12:00:05 -07:00
poll.h
posix_types_32.h
posix_types_64.h
posix_types.h
prctl.h
processor-cyrix.h
processor-flags.h	x86: fix header export, asm-x86/processor-flags.h, CONFIG_* leaks	2008-07-24 12:49:53 +02:00
processor.h	Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-07-23 18:37:44 -07:00
proto.h
ptrace-abi.h	x86 ptrace: unify syscall tracing	2008-07-16 12:15:17 -07:00
ptrace.h
pvclock-abi.h
pvclock.h
reboot_fixups.h
reboot.h
required-features.h
resource.h
resume-trace.h
rio.h
rtc.h
rwlock.h
rwsem.h
scatterlist.h
seccomp_32.h
seccomp_64.h
seccomp.h
sections.h
segment.h	x86: unify and correct the GDT_ENTRY() macro	2008-07-17 11:29:24 -07:00
sembuf.h
serial.h
setup.h	Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus	2008-07-21 16:37:17 +02:00
shmbuf.h
shmparam.h
sigcontext32.h
sigcontext.h
siginfo.h
signal.h	Fix typos from signal_32/64.h merge	2008-07-18 17:59:13 +02:00
smp.h	x86_64: unstatic get_local_pda	2008-07-16 10:55:07 +02:00
socket.h
sockios.h
sparsemem.h
spinlock_types.h	x86/paravirt: add hooks for spinlock operations	2008-07-16 11:15:52 +02:00
spinlock.h	paravirt: introduce a "lock-byte" spinlock implementation	2008-07-16 11:15:53 +02:00
srat.h
stacktrace.h
stat.h
statfs.h
string_32.h
string_64.h
string.h
suspend_32.h
suspend_64.h
suspend.h
swiotlb.h	dma-mapping: add the device argument to dma_mapping_error()	2008-07-26 12:00:03 -07:00
sync_bitops.h
system_64.h
system.h
tce.h
termbits.h
termios.h
therm_throt.h
thread_info.h	clean up duplicated alloc/free_thread_info	2008-07-25 10:53:28 -07:00
time.h
timer.h
timex.h
tlb.h
tlbflush.h
topology.h	x86: change _node_to_cpumask_ptr to return const ptr	2008-07-13 19:11:58 +02:00
trampoline.h
traps.h	x86: introducing asm-x86/traps.h	2008-07-18 18:51:57 +02:00
tsc.h
types.h
uaccess_32.h
uaccess_64.h
uaccess.h	x86: lockless get_user_pages_fast()	2008-07-26 12:00:06 -07:00
ucontext.h
unaligned.h
unistd_32.h	flag parameters add-on: remove epoll_create size param	2008-07-24 10:47:29 -07:00
unistd_64.h	flag parameters add-on: remove epoll_create size param	2008-07-24 10:47:29 -07:00
unistd.h
unwind.h
user32.h
user_32.h
user_64.h
user.h
vdso.h	x86_64: further cleanup of 32-bit compat syscall mechanisms	2008-07-16 11:08:27 +02:00
vga.h
vgtod.h
vic.h
vm86.h
vmi_time.h
vmi.h
voyager.h
vsyscall.h
xor_32.h
xor_64.h
xor.h