diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
| commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
| tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e | |
| parent | 4744b43431e8613f920c5cba88346756f53c5165 (diff) | |
| parent | 7f30491ccd28627742e37899453ae20e3da8e18f (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
| -rw-r--r-- | arch/ia64/include/asm/Kbuild (renamed from include/asm-ia64/Kbuild) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/a.out.h (renamed from include/asm-ia64/a.out.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/acpi-ext.h (renamed from include/asm-ia64/acpi-ext.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/acpi.h (renamed from include/asm-ia64/acpi.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/agp.h (renamed from include/asm-ia64/agp.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/asmmacro.h (renamed from include/asm-ia64/asmmacro.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/atomic.h (renamed from include/asm-ia64/atomic.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/auxvec.h (renamed from include/asm-ia64/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/bitops.h (renamed from include/asm-ia64/bitops.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/break.h (renamed from include/asm-ia64/break.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/bug.h (renamed from include/asm-ia64/bug.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/bugs.h (renamed from include/asm-ia64/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/byteorder.h (renamed from include/asm-ia64/byteorder.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/cache.h (renamed from include/asm-ia64/cache.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/cacheflush.h (renamed from include/asm-ia64/cacheflush.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/checksum.h (renamed from include/asm-ia64/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/compat.h (renamed from include/asm-ia64/compat.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/cpu.h (renamed from include/asm-ia64/cpu.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/cputime.h (renamed from include/asm-ia64/cputime.h) | 3 | ||||
| -rw-r--r-- | arch/ia64/include/asm/current.h (renamed from include/asm-ia64/current.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/cyclone.h (renamed from include/asm-ia64/cyclone.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/delay.h (renamed from include/asm-ia64/delay.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/device.h (renamed from include/asm-ia64/device.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/div64.h (renamed from include/asm-ia64/div64.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/dma-mapping.h (renamed from include/asm-ia64/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/dma.h (renamed from include/asm-ia64/dma.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/dmi.h (renamed from include/asm-ia64/dmi.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/elf.h (renamed from include/asm-ia64/elf.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/emergency-restart.h (renamed from include/asm-ia64/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/errno.h (renamed from include/asm-ia64/errno.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/esi.h (renamed from include/asm-ia64/esi.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/fb.h (renamed from include/asm-ia64/fb.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/fcntl.h (renamed from include/asm-ia64/fcntl.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/fpswa.h (renamed from include/asm-ia64/fpswa.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/fpu.h (renamed from include/asm-ia64/fpu.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/futex.h (renamed from include/asm-ia64/futex.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/gcc_intrin.h (renamed from include/asm-ia64/gcc_intrin.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/hardirq.h (renamed from include/asm-ia64/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/hpsim.h (renamed from include/asm-ia64/hpsim.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/hugetlb.h (renamed from include/asm-ia64/hugetlb.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/hw_irq.h (renamed from include/asm-ia64/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/ia32.h (renamed from include/asm-ia64/ia32.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/ia64regs.h (renamed from include/asm-ia64/ia64regs.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/intel_intrin.h (renamed from include/asm-ia64/intel_intrin.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/intrinsics.h (renamed from include/asm-ia64/intrinsics.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/io.h (renamed from include/asm-ia64/io.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/ioctl.h (renamed from include/asm-ia64/ioctl.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/ioctls.h (renamed from include/asm-ia64/ioctls.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/iosapic.h (renamed from include/asm-ia64/iosapic.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/ipcbuf.h (renamed from include/asm-ia64/ipcbuf.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/irq.h (renamed from include/asm-ia64/irq.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/irq_regs.h (renamed from include/asm-ia64/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kdebug.h (renamed from include/asm-ia64/kdebug.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kexec.h (renamed from include/asm-ia64/kexec.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kmap_types.h (renamed from include/asm-ia64/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kprobes.h (renamed from include/asm-ia64/kprobes.h) | 1 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kregs.h (renamed from include/asm-ia64/kregs.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kvm.h (renamed from include/asm-ia64/kvm.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kvm_host.h (renamed from include/asm-ia64/kvm_host.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kvm_para.h (renamed from include/asm-ia64/kvm_para.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/libata-portmap.h (renamed from include/asm-ia64/libata-portmap.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/linkage.h (renamed from include/asm-ia64/linkage.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/local.h (renamed from include/asm-ia64/local.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec.h (renamed from include/asm-ia64/machvec.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec_dig.h (renamed from include/asm-ia64/machvec_dig.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec_hpsim.h (renamed from include/asm-ia64/machvec_hpsim.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec_hpzx1.h (renamed from include/asm-ia64/machvec_hpzx1.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec_hpzx1_swiotlb.h (renamed from include/asm-ia64/machvec_hpzx1_swiotlb.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec_init.h (renamed from include/asm-ia64/machvec_init.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec_sn2.h (renamed from include/asm-ia64/machvec_sn2.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/machvec_uv.h (renamed from include/asm-ia64/machvec_uv.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mc146818rtc.h (renamed from include/asm-ia64/mc146818rtc.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mca.h (renamed from include/asm-ia64/mca.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mca_asm.h (renamed from include/asm-ia64/mca_asm.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/meminit.h (renamed from include/asm-ia64/meminit.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mman.h (renamed from include/asm-ia64/mman.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mmu.h (renamed from include/asm-ia64/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mmu_context.h (renamed from include/asm-ia64/mmu_context.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mmzone.h (renamed from include/asm-ia64/mmzone.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/module.h (renamed from include/asm-ia64/module.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/msgbuf.h (renamed from include/asm-ia64/msgbuf.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/mutex.h (renamed from include/asm-ia64/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/native/inst.h (renamed from include/asm-ia64/native/inst.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/native/irq.h (renamed from include/asm-ia64/native/irq.h) | 4 | ||||
| -rw-r--r-- | arch/ia64/include/asm/nodedata.h (renamed from include/asm-ia64/nodedata.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/numa.h (renamed from include/asm-ia64/numa.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/page.h (renamed from include/asm-ia64/page.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/pal.h (renamed from include/asm-ia64/pal.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/param.h (renamed from include/asm-ia64/param.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/paravirt.h (renamed from include/asm-ia64/paravirt.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/paravirt_privop.h (renamed from include/asm-ia64/paravirt_privop.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/parport.h (renamed from include/asm-ia64/parport.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/patch.h (renamed from include/asm-ia64/patch.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/pci.h (renamed from include/asm-ia64/pci.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/percpu.h (renamed from include/asm-ia64/percpu.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/perfmon.h (renamed from include/asm-ia64/perfmon.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/perfmon_default_smpl.h (renamed from include/asm-ia64/perfmon_default_smpl.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/pgalloc.h (renamed from include/asm-ia64/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/pgtable.h (renamed from include/asm-ia64/pgtable.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/poll.h (renamed from include/asm-ia64/poll.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/posix_types.h (renamed from include/asm-ia64/posix_types.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/processor.h (renamed from include/asm-ia64/processor.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/ptrace.h (renamed from include/asm-ia64/ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/ptrace_offsets.h (renamed from include/asm-ia64/ptrace_offsets.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/resource.h (renamed from include/asm-ia64/resource.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/rse.h (renamed from include/asm-ia64/rse.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/rwsem.h (renamed from include/asm-ia64/rwsem.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sal.h (renamed from include/asm-ia64/sal.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/scatterlist.h (renamed from include/asm-ia64/scatterlist.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sections.h (renamed from include/asm-ia64/sections.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/segment.h (renamed from include/asm-ia64/segment.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sembuf.h (renamed from include/asm-ia64/sembuf.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/serial.h (renamed from include/asm-ia64/serial.h) | 2 | ||||
| -rw-r--r-- | arch/ia64/include/asm/setup.h (renamed from include/asm-ia64/setup.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/shmbuf.h (renamed from include/asm-ia64/shmbuf.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/shmparam.h (renamed from include/asm-ia64/shmparam.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sigcontext.h (renamed from include/asm-ia64/sigcontext.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/siginfo.h (renamed from include/asm-ia64/siginfo.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/signal.h (renamed from include/asm-ia64/signal.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/smp.h (renamed from include/asm-ia64/smp.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sn/acpi.h (renamed from include/asm-ia64/sn/acpi.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sn/addrs.h (renamed from include/asm-ia64/sn/addrs.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sn/arch.h (renamed from include/asm-ia64/sn/arch.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sn/bte.h (renamed from include/asm-ia64/sn/bte.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sn/clksupport.h (renamed from include/asm-ia64/sn/clksupport.h) | 0 | ||||
| -rw-r--r-- | arch/ia64/include/asm/sn/geo. |