pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Mon, 6 Oct 2008 14:15:57 +0000 (16:15 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 6 Oct 2008 14:15:57 +0000 (16:15 +0200)
commit	b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0
tree	a49c776b88db5346eaef6082c271f5d79319654f	tree \| snapshot
parent	fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0	commit \| diff
parent	1503af661947b7a4a09355cc2ae6aa0d43f16776	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
include/asm-x86/amd_iommu_types.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/atomic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/device.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/efi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/geode.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/gpio.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/idle.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/iommu.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kexec.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kgdb.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kvm_host.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mach-summit/mach_apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mce.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mman.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmconfig.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmzone_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/msr.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/percpu.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/required-features.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/spinlock.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/swiotlb.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uaccess.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uaccess_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uv/uv_bau.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/xen/hypervisor.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

include/asm-x86/acpi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/amd_iommu_types.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/atomic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/device.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/efi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/genapic_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/geode.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/gpio.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/idle.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/iommu.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kexec.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kgdb.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/kvm_host.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mach-summit/mach_apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mce.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mman.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmconfig.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/mmzone_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/msr.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/percpu.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/required-features.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/spinlock.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/swiotlb.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uaccess.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uaccess_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/uv/uv_bau.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/xen/hypervisor.h	diff1 \|	diff2 \|	blob \| history