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

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
5941de8e · Linus Torvalds · c44df741 · c6557e7f · 5941de8e · 5941de8e
135 changed file
--- a/include/asm-s390/Kbuild
+++ b/include/asm-s390/Kbuild
--- a/include/asm-s390/airq.h
+++ b/include/asm-s390/airq.h
--- a/include/asm-s390/appldata.h
+++ b/include/asm-s390/appldata.h
--- a/include/asm-s390/atomic.h
+++ b/include/asm-s390/atomic.h
--- a/include/asm-s390/auxvec.h
+++ b/include/asm-s390/auxvec.h
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
--- a/include/asm-s390/bugs.h
+++ b/include/asm-s390/bugs.h
--- a/include/asm-s390/byteorder.h
+++ b/include/asm-s390/byteorder.h
--- a/include/asm-s390/cache.h
+++ b/include/asm-s390/cache.h
--- a/include/asm-s390/cacheflush.h
+++ b/include/asm-s390/cacheflush.h
--- a/include/asm-s390/ccwdev.h
+++ b/include/asm-s390/ccwdev.h
--- a/include/asm-s390/ccwgroup.h
+++ b/include/asm-s390/ccwgroup.h
--- a/include/asm-s390/checksum.h
+++ b/include/asm-s390/checksum.h
--- a/include/asm-s390/chpid.h
+++ b/include/asm-s390/chpid.h
--- a/include/asm-s390/chsc.h
+++ b/include/asm-s390/chsc.h
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
--- a/include/asm-s390/cmb.h
+++ b/include/asm-s390/cmb.h
--- a/include/asm-s390/compat.h
+++ b/include/asm-s390/compat.h
--- a/include/asm-s390/cpcmd.h
+++ b/include/asm-s390/cpcmd.h
--- a/include/asm-s390/cpu.h
+++ b/include/asm-s390/cpu.h
--- a/include/asm-s390/cputime.h
+++ b/include/asm-s390/cputime.h
--- a/include/asm-s390/current.h
+++ b/include/asm-s390/current.h
--- a/include/asm-s390/dasd.h
+++ b/include/asm-s390/dasd.h
--- a/include/asm-s390/debug.h
+++ b/include/asm-s390/debug.h
--- a/include/asm-s390/delay.h
+++ b/include/asm-s390/delay.h
--- a/include/asm-s390/device.h
+++ b/include/asm-s390/device.h
--- a/include/asm-s390/diag.h
+++ b/include/asm-s390/diag.h
--- a/include/asm-s390/div64.h
+++ b/include/asm-s390/div64.h
--- a/include/asm-s390/dma.h
+++ b/include/asm-s390/dma.h
--- a/include/asm-s390/ebcdic.h
+++ b/include/asm-s390/ebcdic.h
--- a/include/asm-s390/elf.h
+++ b/include/asm-s390/elf.h
--- a/include/asm-s390/emergency-restart.h
+++ b/include/asm-s390/emergency-restart.h
--- a/include/asm-s390/errno.h
+++ b/include/asm-s390/errno.h
--- a/include/asm-s390/etr.h
+++ b/include/asm-s390/etr.h
--- a/include/asm-s390/extmem.h
+++ b/include/asm-s390/extmem.h
--- a/include/asm-s390/fb.h
+++ b/include/asm-s390/fb.h
--- a/include/asm-s390/fcntl.h
+++ b/include/asm-s390/fcntl.h
--- a/include/asm-s390/fcx.h
+++ b/include/asm-s390/fcx.h
--- a/include/asm-s390/futex.h
+++ b/include/asm-s390/futex.h
--- a/include/asm-s390/hardirq.h
+++ b/include/asm-s390/hardirq.h
--- a/include/asm-s390/hugetlb.h
+++ b/include/asm-s390/hugetlb.h
--- a/include/asm-s390/idals.h
+++ b/include/asm-s390/idals.h
--- a/include/asm-s390/io.h
+++ b/include/asm-s390/io.h
--- a/include/asm-s390/ioctl.h
+++ b/include/asm-s390/ioctl.h
--- a/include/asm-s390/ioctls.h
+++ b/include/asm-s390/ioctls.h
--- a/include/asm-s390/ipcbuf.h
+++ b/include/asm-s390/ipcbuf.h
--- a/include/asm-s390/ipl.h
+++ b/include/asm-s390/ipl.h
--- a/include/asm-s390/irq.h
+++ b/include/asm-s390/irq.h
--- a/include/asm-s390/irq_regs.h
+++ b/include/asm-s390/irq_regs.h
--- a/include/asm-s390/irqflags.h
+++ b/include/asm-s390/irqflags.h
--- a/include/asm-s390/isc.h
+++ b/include/asm-s390/isc.h
--- a/include/asm-s390/itcw.h
+++ b/include/asm-s390/itcw.h
--- a/include/asm-s390/kdebug.h
+++ b/include/asm-s390/kdebug.h
--- a/include/asm-s390/kexec.h
+++ b/include/asm-s390/kexec.h
--- a/include/asm-s390/kmap_types.h
+++ b/include/asm-s390/kmap_types.h
--- a/include/asm-s390/kprobes.h
+++ b/include/asm-s390/kprobes.h
--- a/include/asm-s390/kvm.h
+++ b/include/asm-s390/kvm.h
--- a/include/asm-s390/kvm_host.h
+++ b/include/asm-s390/kvm_host.h
--- a/include/asm-s390/kvm_para.h
+++ b/include/asm-s390/kvm_para.h
--- a/include/asm-s390/kvm_virtio.h
+++ b/include/asm-s390/kvm_virtio.h
--- a/include/asm-s390/linkage.h
+++ b/include/asm-s390/linkage.h
--- a/include/asm-s390/local.h
+++ b/include/asm-s390/local.h
--- a/include/asm-s390/lowcore.h
+++ b/include/asm-s390/lowcore.h
--- a/include/asm-s390/mathemu.h
+++ b/include/asm-s390/mathemu.h
--- a/include/asm-s390/mman.h
+++ b/include/asm-s390/mman.h
--- a/include/asm-s390/mmu.h
+++ b/include/asm-s390/mmu.h
--- a/include/asm-s390/mmu_context.h
+++ b/include/asm-s390/mmu_context.h
--- a/include/asm-s390/module.h
+++ b/include/asm-s390/module.h
--- a/include/asm-s390/monwriter.h
+++ b/include/asm-s390/monwriter.h
--- a/include/asm-s390/msgbuf.h
+++ b/include/asm-s390/msgbuf.h
--- a/include/asm-s390/mutex.h
+++ b/include/asm-s390/mutex.h
--- a/include/asm-s390/page.h
+++ b/include/asm-s390/page.h
--- a/include/asm-s390/param.h
+++ b/include/asm-s390/param.h
--- a/include/asm-s390/pci.h
+++ b/include/asm-s390/pci.h
--- a/include/asm-s390/percpu.h
+++ b/include/asm-s390/percpu.h
--- a/include/asm-s390/pgalloc.h
+++ b/include/asm-s390/pgalloc.h
--- a/include/asm-s390/pgtable.h
+++ b/include/asm-s390/pgtable.h
--- a/include/asm-s390/poll.h
+++ b/include/asm-s390/poll.h
--- a/include/asm-s390/posix_types.h
+++ b/include/asm-s390/posix_types.h
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
--- a/include/asm-s390/ptrace.h
+++ b/include/asm-s390/ptrace.h
--- a/include/asm-s390/qdio.h
+++ b/include/asm-s390/qdio.h
--- a/include/asm-s390/qeth.h
+++ b/include/asm-s390/qeth.h
--- a/include/asm-s390/reset.h
+++ b/include/asm-s390/reset.h
--- a/include/asm-s390/resource.h
+++ b/include/asm-s390/resource.h
--- a/include/asm-s390/rwsem.h
+++ b/include/asm-s390/rwsem.h
--- a/include/asm-s390/s390_ext.h
+++ b/include/asm-s390/s390_ext.h
--- a/include/asm-s390/s390_rdev.h
+++ b/include/asm-s390/s390_rdev.h
--- a/include/asm-s390/scatterlist.h
+++ b/include/asm-s390/scatterlist.h
--- a/include/asm-s390/schid.h
+++ b/include/asm-s390/schid.h
--- a/include/asm-s390/sclp.h
+++ b/include/asm-s390/sclp.h
--- a/include/asm-s390/sections.h
+++ b/include/asm-s390/sections.h
--- a/include/asm-s390/segment.h
+++ b/include/asm-s390/segment.h
--- a/include/asm-s390/sembuf.h
+++ b/include/asm-s390/sembuf.h
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
--- a/include/asm-s390/sfp-machine.h
+++ b/include/asm-s390/sfp-machine.h
--- a/include/asm-s390/sfp-util.h
+++ b/include/asm-s390/sfp-util.h
--- a/include/asm-s390/shmbuf.h
+++ b/include/asm-s390/shmbuf.h
--- a/include/asm-s390/shmparam.h
+++ b/include/asm-s390/shmparam.h
--- a/include/asm-s390/sigcontext.h
+++ b/include/asm-s390/sigcontext.h
--- a/include/asm-s390/siginfo.h
+++ b/include/asm-s390/siginfo.h
--- a/include/asm-s390/signal.h
+++ b/include/asm-s390/signal.h
--- a/include/asm-s390/sigp.h
+++ b/include/asm-s390/sigp.h
--- a/include/asm-s390/smp.h
+++ b/include/asm-s390/smp.h
--- a/include/asm-s390/socket.h
+++ b/include/asm-s390/socket.h
--- a/include/asm-s390/sockios.h
+++ b/include/asm-s390/sockios.h
--- a/include/asm-s390/sparsemem.h
+++ b/include/asm-s390/sparsemem.h
--- a/include/asm-s390/spinlock.h
+++ b/include/asm-s390/spinlock.h
--- a/include/asm-s390/spinlock_types.h
+++ b/include/asm-s390/spinlock_types.h
--- a/include/asm-s390/stat.h
+++ b/include/asm-s390/stat.h
--- a/include/asm-s390/statfs.h
+++ b/include/asm-s390/statfs.h
--- a/include/asm-s390/string.h
+++ b/include/asm-s390/string.h
--- a/include/asm-s390/suspend.h
+++ b/include/asm-s390/suspend.h
--- a/include/asm-s390/sysinfo.h
+++ b/include/asm-s390/sysinfo.h
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
--- a/include/asm-s390/tape390.h
+++ b/include/asm-s390/tape390.h
--- a/include/asm-s390/termbits.h
+++ b/include/asm-s390/termbits.h
--- a/include/asm-s390/termios.h
+++ b/include/asm-s390/termios.h
--- a/include/asm-s390/thread_info.h
+++ b/include/asm-s390/thread_info.h
--- a/include/asm-s390/timer.h
+++ b/include/asm-s390/timer.h
--- a/include/asm-s390/timex.h
+++ b/include/asm-s390/timex.h
--- a/include/asm-s390/tlb.h
+++ b/include/asm-s390/tlb.h
--- a/include/asm-s390/tlbflush.h
+++ b/include/asm-s390/tlbflush.h
--- a/include/asm-s390/todclk.h
+++ b/include/asm-s390/todclk.h
--- a/include/asm-s390/topology.h
+++ b/include/asm-s390/topology.h
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
--- a/include/asm-s390/uaccess.h
+++ b/include/asm-s390/uaccess.h
--- a/include/asm-s390/ucontext.h
+++ b/include/asm-s390/ucontext.h
--- a/include/asm-s390/unaligned.h
+++ b/include/asm-s390/unaligned.h
--- a/include/asm-s390/unistd.h
+++ b/include/asm-s390/unistd.h
--- a/include/asm-s390/user.h
+++ b/include/asm-s390/user.h
--- a/include/asm-s390/vtoc.h
+++ b/include/asm-s390/vtoc.h
--- a/include/asm-s390/xor.h
+++ b/include/asm-s390/xor.h
--- a/include/asm-s390/zcrypt.h
+++ b/include/asm-s390/zcrypt.h