]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:15:57 +0000 (16:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:15:57 +0000 (16:15 +0200)
commitb8cd9d056bbc5f2630ab1787dbf76f83bbb517c0
treea49c776b88db5346eaef6082c271f5d79319654f
parentfec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0
parent1503af661947b7a4a09355cc2ae6aa0d43f16776
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
37 files changed:
include/asm-x86/acpi.h
include/asm-x86/amd_iommu_types.h
include/asm-x86/atomic_64.h
include/asm-x86/cpufeature.h
include/asm-x86/device.h
include/asm-x86/dma-mapping.h
include/asm-x86/efi.h
include/asm-x86/genapic_32.h
include/asm-x86/genapic_64.h
include/asm-x86/geode.h
include/asm-x86/gpio.h
include/asm-x86/hw_irq.h
include/asm-x86/i387.h
include/asm-x86/idle.h
include/asm-x86/io.h
include/asm-x86/iommu.h
include/asm-x86/irq_vectors.h
include/asm-x86/kexec.h
include/asm-x86/kgdb.h
include/asm-x86/kvm_host.h
include/asm-x86/mach-summit/mach_apic.h
include/asm-x86/mce.h
include/asm-x86/mman.h
include/asm-x86/mmconfig.h
include/asm-x86/mmzone_32.h
include/asm-x86/msr.h
include/asm-x86/percpu.h
include/asm-x86/pgtable.h
include/asm-x86/pgtable_64.h
include/asm-x86/processor.h
include/asm-x86/required-features.h
include/asm-x86/spinlock.h
include/asm-x86/swiotlb.h
include/asm-x86/uaccess.h
include/asm-x86/uaccess_64.h
include/asm-x86/uv/uv_bau.h
include/asm-x86/xen/hypervisor.h