Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
3d8cd0c5 · Linus Torvalds · 4c514a5a · 58750139 · 3d8cd0c5 · 3d8cd0c5
139 changed file
--- a/include/asm-m68knommu/Kbuild
+++ b/include/asm-m68knommu/Kbuild
--- a/include/asm-m68knommu/MC68328.h
+++ b/include/asm-m68knommu/MC68328.h
--- a/include/asm-m68knommu/MC68332.h
+++ b/include/asm-m68knommu/MC68332.h
--- a/include/asm-m68knommu/MC68EZ328.h
+++ b/include/asm-m68knommu/MC68EZ328.h
--- a/include/asm-m68knommu/MC68VZ328.h
+++ b/include/asm-m68knommu/MC68VZ328.h
--- a/include/asm-m68knommu/a.out.h
+++ b/include/asm-m68knommu/a.out.h
--- a/include/asm-m68knommu/anchor.h
+++ b/include/asm-m68knommu/anchor.h
--- a/include/asm-m68knommu/atomic.h
+++ b/include/asm-m68knommu/atomic.h
--- a/include/asm-m68knommu/auxvec.h
+++ b/include/asm-m68knommu/auxvec.h
--- a/include/asm-m68knommu/bitops.h
+++ b/include/asm-m68knommu/bitops.h
--- a/include/asm-m68knommu/bootinfo.h
+++ b/include/asm-m68knommu/bootinfo.h
--- a/include/asm-m68knommu/bootstd.h
+++ b/include/asm-m68knommu/bootstd.h
--- a/include/asm-m68knommu/bug.h
+++ b/include/asm-m68knommu/bug.h
--- a/include/asm-m68knommu/bugs.h
+++ b/include/asm-m68knommu/bugs.h
--- a/include/asm-m68knommu/byteorder.h
+++ b/include/asm-m68knommu/byteorder.h
--- a/include/asm-m68knommu/cache.h
+++ b/include/asm-m68knommu/cache.h
--- a/include/asm-m68knommu/cachectl.h
+++ b/include/asm-m68knommu/cachectl.h
--- a/include/asm-m68knommu/cacheflush.h
+++ b/include/asm-m68knommu/cacheflush.h
--- a/include/asm-m68knommu/checksum.h
+++ b/include/asm-m68knommu/checksum.h
--- a/include/asm-m68knommu/coldfire.h
+++ b/include/asm-m68knommu/coldfire.h
--- a/include/asm-m68knommu/commproc.h
+++ b/include/asm-m68knommu/commproc.h
--- a/include/asm-m68knommu/cputime.h
+++ b/include/asm-m68knommu/cputime.h
--- a/include/asm-m68knommu/current.h
+++ b/include/asm-m68knommu/current.h
--- a/include/asm-m68knommu/dbg.h
+++ b/include/asm-m68knommu/dbg.h
--- a/include/asm-m68knommu/delay.h
+++ b/include/asm-m68knommu/delay.h
--- a/include/asm-m68knommu/device.h
+++ b/include/asm-m68knommu/device.h
--- a/include/asm-m68knommu/div64.h
+++ b/include/asm-m68knommu/div64.h
--- a/include/asm-m68knommu/dma-mapping.h
+++ b/include/asm-m68knommu/dma-mapping.h
--- a/include/asm-m68knommu/dma.h
+++ b/include/asm-m68knommu/dma.h
--- a/include/asm-m68knommu/elf.h
+++ b/include/asm-m68knommu/elf.h
--- a/include/asm-m68knommu/elia.h
+++ b/include/asm-m68knommu/elia.h
--- a/include/asm-m68knommu/emergency-restart.h
+++ b/include/asm-m68knommu/emergency-restart.h
--- a/include/asm-m68knommu/entry.h
+++ b/include/asm-m68knommu/entry.h
--- a/include/asm-m68knommu/errno.h
+++ b/include/asm-m68knommu/errno.h
--- a/include/asm-m68knommu/fb.h
+++ b/include/asm-m68knommu/fb.h
--- a/include/asm-m68knommu/fcntl.h
+++ b/include/asm-m68knommu/fcntl.h
--- a/include/asm-m68knommu/flat.h
+++ b/include/asm-m68knommu/flat.h
--- a/include/asm-m68knommu/fpu.h
+++ b/include/asm-m68knommu/fpu.h
--- a/include/asm-m68knommu/futex.h
+++ b/include/asm-m68knommu/futex.h
--- a/include/asm-m68knommu/hardirq.h
+++ b/include/asm-m68knommu/hardirq.h
--- a/include/asm-m68knommu/hw_irq.h
+++ b/include/asm-m68knommu/hw_irq.h
--- a/include/asm-m68knommu/hwtest.h
+++ b/include/asm-m68knommu/hwtest.h
--- a/include/asm-m68knommu/io.h
+++ b/include/asm-m68knommu/io.h
--- a/include/asm-m68knommu/ioctl.h
+++ b/include/asm-m68knommu/ioctl.h
--- a/include/asm-m68knommu/ioctls.h
+++ b/include/asm-m68knommu/ioctls.h
--- a/include/asm-m68knommu/ipcbuf.h
+++ b/include/asm-m68knommu/ipcbuf.h
--- a/include/asm-m68knommu/irq.h
+++ b/include/asm-m68knommu/irq.h
--- a/include/asm-m68knommu/irq_regs.h
+++ b/include/asm-m68knommu/irq_regs.h
--- a/include/asm-m68knommu/kdebug.h
+++ b/include/asm-m68knommu/kdebug.h
--- a/include/asm-m68knommu/kmap_types.h
+++ b/include/asm-m68knommu/kmap_types.h
--- a/include/asm-m68knommu/linkage.h
+++ b/include/asm-m68knommu/linkage.h
--- a/include/asm-m68knommu/local.h
+++ b/include/asm-m68knommu/local.h
--- a/include/asm-m68knommu/m5206sim.h
+++ b/include/asm-m68knommu/m5206sim.h
--- a/include/asm-m68knommu/m520xsim.h
+++ b/include/asm-m68knommu/m520xsim.h
--- a/include/asm-m68knommu/m523xsim.h
+++ b/include/asm-m68knommu/m523xsim.h
--- a/include/asm-m68knommu/m5249sim.h
+++ b/include/asm-m68knommu/m5249sim.h
--- a/include/asm-m68knommu/m5272sim.h
+++ b/include/asm-m68knommu/m5272sim.h
--- a/include/asm-m68knommu/m527xsim.h
+++ b/include/asm-m68knommu/m527xsim.h
--- a/include/asm-m68knommu/m528xsim.h
+++ b/include/asm-m68knommu/m528xsim.h
--- a/include/asm-m68knommu/m5307sim.h
+++ b/include/asm-m68knommu/m5307sim.h
--- a/include/asm-m68knommu/m532xsim.h
+++ b/include/asm-m68knommu/m532xsim.h
--- a/include/asm-m68knommu/m5407sim.h
+++ b/include/asm-m68knommu/m5407sim.h
--- a/include/asm-m68knommu/m68360.h
+++ b/include/asm-m68knommu/m68360.h
--- a/include/asm-m68knommu/m68360_enet.h
+++ b/include/asm-m68knommu/m68360_enet.h
--- a/include/asm-m68knommu/m68360_pram.h
+++ b/include/asm-m68knommu/m68360_pram.h
--- a/include/asm-m68knommu/m68360_quicc.h
+++ b/include/asm-m68knommu/m68360_quicc.h
--- a/include/asm-m68knommu/m68360_regs.h
+++ b/include/asm-m68knommu/m68360_regs.h
--- a/include/asm-m68knommu/machdep.h
+++ b/include/asm-m68knommu/machdep.h
--- a/include/asm-m68knommu/math-emu.h
+++ b/include/asm-m68knommu/math-emu.h
--- a/include/asm-m68knommu/mc146818rtc.h
+++ b/include/asm-m68knommu/mc146818rtc.h
--- a/include/asm-m68knommu/mcfcache.h
+++ b/include/asm-m68knommu/mcfcache.h
--- a/include/asm-m68knommu/mcfdma.h
+++ b/include/asm-m68knommu/mcfdma.h
--- a/include/asm-m68knommu/mcfmbus.h
+++ b/include/asm-m68knommu/mcfmbus.h
--- a/include/asm-m68knommu/mcfne.h
+++ b/include/asm-m68knommu/mcfne.h
--- a/include/asm-m68knommu/mcfpci.h
+++ b/include/asm-m68knommu/mcfpci.h
--- a/include/asm-m68knommu/mcfpit.h
+++ b/include/asm-m68knommu/mcfpit.h
--- a/include/asm-m68knommu/mcfsim.h
+++ b/include/asm-m68knommu/mcfsim.h
--- a/include/asm-m68knommu/mcfsmc.h
+++ b/include/asm-m68knommu/mcfsmc.h
--- a/include/asm-m68knommu/mcftimer.h
+++ b/include/asm-m68knommu/mcftimer.h
--- a/include/asm-m68knommu/mcfuart.h
+++ b/include/asm-m68knommu/mcfuart.h
--- a/include/asm-m68knommu/mcfwdebug.h
+++ b/include/asm-m68knommu/mcfwdebug.h
--- a/include/asm-m68knommu/md.h
+++ b/include/asm-m68knommu/md.h
--- a/include/asm-m68knommu/mman.h
+++ b/include/asm-m68knommu/mman.h
--- a/include/asm-m68knommu/mmu.h
+++ b/include/asm-m68knommu/mmu.h
--- a/include/asm-m68knommu/mmu_context.h
+++ b/include/asm-m68knommu/mmu_context.h
--- a/include/asm-m68knommu/module.h
+++ b/include/asm-m68knommu/module.h
--- a/include/asm-m68knommu/movs.h
+++ b/include/asm-m68knommu/movs.h
--- a/include/asm-m68knommu/msgbuf.h
+++ b/include/asm-m68knommu/msgbuf.h
--- a/include/asm-m68knommu/mutex.h
+++ b/include/asm-m68knommu/mutex.h
--- a/include/asm-m68knommu/nettel.h
+++ b/include/asm-m68knommu/nettel.h
--- a/include/asm-m68knommu/openprom.h
+++ b/include/asm-m68knommu/openprom.h
--- a/include/asm-m68knommu/oplib.h
+++ b/include/asm-m68knommu/oplib.h
--- a/include/asm-m68knommu/page.h
+++ b/include/asm-m68knommu/page.h
--- a/include/asm-m68knommu/page_offset.h
+++ b/include/asm-m68knommu/page_offset.h
--- a/include/asm-m68knommu/param.h
+++ b/include/asm-m68knommu/param.h
--- a/include/asm-m68knommu/pci.h
+++ b/include/asm-m68knommu/pci.h
--- a/include/asm-m68knommu/percpu.h
+++ b/include/asm-m68knommu/percpu.h
--- a/include/asm-m68knommu/pgalloc.h
+++ b/include/asm-m68knommu/pgalloc.h
--- a/include/asm-m68knommu/pgtable.h
+++ b/include/asm-m68knommu/pgtable.h
--- a/include/asm-m68knommu/poll.h
+++ b/include/asm-m68knommu/poll.h
--- a/include/asm-m68knommu/posix_types.h
+++ b/include/asm-m68knommu/posix_types.h
--- a/include/asm-m68knommu/processor.h
+++ b/include/asm-m68knommu/processor.h
--- a/include/asm-m68knommu/ptrace.h
+++ b/include/asm-m68knommu/ptrace.h
--- a/include/asm-m68knommu/quicc_simple.h
+++ b/include/asm-m68knommu/quicc_simple.h
--- a/include/asm-m68knommu/resource.h
+++ b/include/asm-m68knommu/resource.h
--- a/include/asm-m68knommu/rtc.h
+++ b/include/asm-m68knommu/rtc.h
--- a/include/asm-m68knommu/scatterlist.h
+++ b/include/asm-m68knommu/scatterlist.h
--- a/include/asm-m68knommu/sections.h
+++ b/include/asm-m68knommu/sections.h
--- a/include/asm-m68knommu/segment.h
+++ b/include/asm-m68knommu/segment.h
--- a/include/asm-m68knommu/sembuf.h
+++ b/include/asm-m68knommu/sembuf.h
--- a/include/asm-m68knommu/setup.h
+++ b/include/asm-m68knommu/setup.h
--- a/include/asm-m68knommu/shm.h
+++ b/include/asm-m68knommu/shm.h
--- a/include/asm-m68knommu/shmbuf.h
+++ b/include/asm-m68knommu/shmbuf.h
--- a/include/asm-m68knommu/shmparam.h
+++ b/include/asm-m68knommu/shmparam.h
--- a/include/asm-m68knommu/sigcontext.h
+++ b/include/asm-m68knommu/sigcontext.h
--- a/include/asm-m68knommu/siginfo.h
+++ b/include/asm-m68knommu/siginfo.h
--- a/include/asm-m68knommu/signal.h
+++ b/include/asm-m68knommu/signal.h
--- a/include/asm-m68knommu/smp.h
+++ b/include/asm-m68knommu/smp.h
--- a/include/asm-m68knommu/socket.h
+++ b/include/asm-m68knommu/socket.h
--- a/include/asm-m68knommu/sockios.h
+++ b/include/asm-m68knommu/sockios.h
--- a/include/asm-m68knommu/spinlock.h
+++ b/include/asm-m68knommu/spinlock.h
--- a/include/asm-m68knommu/stat.h
+++ b/include/asm-m68knommu/stat.h
--- a/include/asm-m68knommu/statfs.h
+++ b/include/asm-m68knommu/statfs.h
--- a/include/asm-m68knommu/string.h
+++ b/include/asm-m68knommu/string.h
--- a/include/asm-m68knommu/system.h
+++ b/include/asm-m68knommu/system.h
--- a/include/asm-m68knommu/termbits.h
+++ b/include/asm-m68knommu/termbits.h
--- a/include/asm-m68knommu/termios.h
+++ b/include/asm-m68knommu/termios.h
--- a/include/asm-m68knommu/thread_info.h
+++ b/include/asm-m68knommu/thread_info.h
--- a/include/asm-m68knommu/timex.h
+++ b/include/asm-m68knommu/timex.h
--- a/include/asm-m68knommu/tlb.h
+++ b/include/asm-m68knommu/tlb.h
--- a/include/asm-m68knommu/tlbflush.h
+++ b/include/asm-m68knommu/tlbflush.h
--- a/include/asm-m68knommu/topology.h
+++ b/include/asm-m68knommu/topology.h
--- a/include/asm-m68knommu/traps.h
+++ b/include/asm-m68knommu/traps.h
--- a/include/asm-m68knommu/types.h
+++ b/include/asm-m68knommu/types.h
--- a/include/asm-m68knommu/uaccess.h
+++ b/include/asm-m68knommu/uaccess.h
--- a/include/asm-m68knommu/ucontext.h
+++ b/include/asm-m68knommu/ucontext.h
--- a/include/asm-m68knommu/unaligned.h
+++ b/include/asm-m68knommu/unaligned.h
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
--- a/include/asm-m68knommu/user.h
+++ b/include/asm-m68knommu/user.h