Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] move include/asm-s390 to arch/s390/include/asm
2008-08-04 17:15:07 -07:00 · 2008-08-04 17:15:07 -07:00 · 5941de8ead
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
--- a/arch/s390/include/asm/airq.h
+++ b/arch/s390/include/asm/airq.h
--- a/arch/s390/include/asm/appldata.h
+++ b/arch/s390/include/asm/appldata.h
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
--- a/arch/s390/include/asm/auxvec.h
+++ b/arch/s390/include/asm/auxvec.h
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
--- a/arch/s390/include/asm/bugs.h
+++ b/arch/s390/include/asm/bugs.h
--- a/arch/s390/include/asm/byteorder.h
+++ b/arch/s390/include/asm/byteorder.h
--- a/arch/s390/include/asm/cache.h
+++ b/arch/s390/include/asm/cache.h
--- a/arch/s390/include/asm/cacheflush.h
+++ b/arch/s390/include/asm/cacheflush.h
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
--- a/arch/s390/include/asm/ccwgroup.h
+++ b/arch/s390/include/asm/ccwgroup.h
--- a/arch/s390/include/asm/checksum.h
+++ b/arch/s390/include/asm/checksum.h
--- a/arch/s390/include/asm/chpid.h
+++ b/arch/s390/include/asm/chpid.h
--- a/arch/s390/include/asm/chsc.h
+++ b/arch/s390/include/asm/chsc.h
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
--- a/arch/s390/include/asm/cmb.h
+++ b/arch/s390/include/asm/cmb.h
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
--- a/arch/s390/include/asm/cpcmd.h
+++ b/arch/s390/include/asm/cpcmd.h
--- a/arch/s390/include/asm/cpu.h
+++ b/arch/s390/include/asm/cpu.h
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
--- a/arch/s390/include/asm/current.h
+++ b/arch/s390/include/asm/current.h
--- a/arch/s390/include/asm/dasd.h
+++ b/arch/s390/include/asm/dasd.h
--- a/arch/s390/include/asm/debug.h
+++ b/arch/s390/include/asm/debug.h
--- a/arch/s390/include/asm/delay.h
+++ b/arch/s390/include/asm/delay.h
--- a/arch/s390/include/asm/device.h
+++ b/arch/s390/include/asm/device.h
--- a/arch/s390/include/asm/diag.h
+++ b/arch/s390/include/asm/diag.h
--- a/arch/s390/include/asm/div64.h
+++ b/arch/s390/include/asm/div64.h
--- a/arch/s390/include/asm/dma.h
+++ b/arch/s390/include/asm/dma.h
--- a/arch/s390/include/asm/ebcdic.h
+++ b/arch/s390/include/asm/ebcdic.h
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
--- a/arch/s390/include/asm/emergency-restart.h
+++ b/arch/s390/include/asm/emergency-restart.h
--- a/arch/s390/include/asm/errno.h
+++ b/arch/s390/include/asm/errno.h
--- a/arch/s390/include/asm/etr.h
+++ b/arch/s390/include/asm/etr.h
--- a/arch/s390/include/asm/extmem.h
+++ b/arch/s390/include/asm/extmem.h
--- a/arch/s390/include/asm/fb.h
+++ b/arch/s390/include/asm/fb.h
--- a/arch/s390/include/asm/fcntl.h
+++ b/arch/s390/include/asm/fcntl.h
--- a/arch/s390/include/asm/fcx.h
+++ b/arch/s390/include/asm/fcx.h
--- a/arch/s390/include/asm/futex.h
+++ b/arch/s390/include/asm/futex.h
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
--- a/arch/s390/include/asm/hugetlb.h
+++ b/arch/s390/include/asm/hugetlb.h
--- a/arch/s390/include/asm/idals.h
+++ b/arch/s390/include/asm/idals.h
--- a/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h
--- a/arch/s390/include/asm/ioctl.h
+++ b/arch/s390/include/asm/ioctl.h
--- a/arch/s390/include/asm/ioctls.h
+++ b/arch/s390/include/asm/ioctls.h
--- a/arch/s390/include/asm/ipcbuf.h
+++ b/arch/s390/include/asm/ipcbuf.h
--- a/arch/s390/include/asm/ipl.h
+++ b/arch/s390/include/asm/ipl.h
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
--- a/arch/s390/include/asm/irq_regs.h
+++ b/arch/s390/include/asm/irq_regs.h
--- a/arch/s390/include/asm/irqflags.h
+++ b/arch/s390/include/asm/irqflags.h
--- a/arch/s390/include/asm/isc.h
+++ b/arch/s390/include/asm/isc.h
--- a/arch/s390/include/asm/itcw.h
+++ b/arch/s390/include/asm/itcw.h
--- a/arch/s390/include/asm/kdebug.h
+++ b/arch/s390/include/asm/kdebug.h
--- a/arch/s390/include/asm/kexec.h
+++ b/arch/s390/include/asm/kexec.h
--- a/arch/s390/include/asm/kmap_types.h
+++ b/arch/s390/include/asm/kmap_types.h
--- a/arch/s390/include/asm/kprobes.h
+++ b/arch/s390/include/asm/kprobes.h
--- a/arch/s390/include/asm/kvm.h
+++ b/arch/s390/include/asm/kvm.h
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
--- a/arch/s390/include/asm/kvm_para.h
+++ b/arch/s390/include/asm/kvm_para.h
--- a/arch/s390/include/asm/kvm_virtio.h
+++ b/arch/s390/include/asm/kvm_virtio.h
--- a/arch/s390/include/asm/linkage.h
+++ b/arch/s390/include/asm/linkage.h
--- a/arch/s390/include/asm/local.h
+++ b/arch/s390/include/asm/local.h
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
--- a/arch/s390/include/asm/mathemu.h
+++ b/arch/s390/include/asm/mathemu.h
--- a/arch/s390/include/asm/mman.h
+++ b/arch/s390/include/asm/mman.h
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
--- a/arch/s390/include/asm/module.h
+++ b/arch/s390/include/asm/module.h
--- a/arch/s390/include/asm/monwriter.h
+++ b/arch/s390/include/asm/monwriter.h
--- a/arch/s390/include/asm/msgbuf.h
+++ b/arch/s390/include/asm/msgbuf.h
--- a/arch/s390/include/asm/mutex.h
+++ b/arch/s390/include/asm/mutex.h
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
--- a/arch/s390/include/asm/param.h
+++ b/arch/s390/include/asm/param.h
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
--- a/arch/s390/include/asm/percpu.h
+++ b/arch/s390/include/asm/percpu.h
--- a/arch/s390/include/asm/pgalloc.h
+++ b/arch/s390/include/asm/pgalloc.h
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
--- a/arch/s390/include/asm/poll.h
+++ b/arch/s390/include/asm/poll.h
--- a/arch/s390/include/asm/posix_types.h
+++ b/arch/s390/include/asm/posix_types.h
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
--- a/arch/s390/include/asm/qeth.h
+++ b/arch/s390/include/asm/qeth.h
--- a/arch/s390/include/asm/reset.h
+++ b/arch/s390/include/asm/reset.h
--- a/arch/s390/include/asm/resource.h
+++ b/arch/s390/include/asm/resource.h
--- a/arch/s390/include/asm/rwsem.h
+++ b/arch/s390/include/asm/rwsem.h
--- a/arch/s390/include/asm/s390_ext.h
+++ b/arch/s390/include/asm/s390_ext.h
--- a/arch/s390/include/asm/s390_rdev.h
+++ b/arch/s390/include/asm/s390_rdev.h
--- a/arch/s390/include/asm/scatterlist.h
+++ b/arch/s390/include/asm/scatterlist.h
--- a/arch/s390/include/asm/schid.h
+++ b/arch/s390/include/asm/schid.h
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
--- a/arch/s390/include/asm/sections.h
+++ b/arch/s390/include/asm/sections.h
--- a/arch/s390/include/asm/segment.h
+++ b/arch/s390/include/asm/segment.h
--- a/arch/s390/include/asm/sembuf.h
+++ b/arch/s390/include/asm/sembuf.h
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
--- a/arch/s390/include/asm/sfp-machine.h
+++ b/arch/s390/include/asm/sfp-machine.h
--- a/arch/s390/include/asm/sfp-util.h
+++ b/arch/s390/include/asm/sfp-util.h
--- a/arch/s390/include/asm/shmbuf.h
+++ b/arch/s390/include/asm/shmbuf.h
--- a/arch/s390/include/asm/shmparam.h
+++ b/arch/s390/include/asm/shmparam.h
--- a/Показать больше
+++ b/Показать больше