github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-09 14:51:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
6104f472a5
linux/arch/m68k/kernel
History
Linus Torvalds 3127f23f01 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 
Pull m68k updates from Geert Uytterhoeven.

Fix up trivial conflict (m68k switched to generic version of
uapi/asm/socket.h, net tree updated the old one) as per Geert.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/sun3: Fix instruction faults
  m68k/sun3: Get interrupts working again
  m68k: move to a single instance of free_initmem()
  m68k: merge MMU and non-MMU versions of mm/init.c
  m68k: switch to using the asm-generic termios.h
  m68k: switch to using the asm-generic termbits.h
  m68k: switch to using the asm-generic sockios.h
  m68k: switch to using the asm-generic socket.h
  m68k: switch to using the asm-generic shmbuf.h
  m68k: switch to using the asm-generic sembuf.h
  m68k: switch to using the asm-generic msgbuf.h
  m68k: switch to using the asm-generic auxvec.h
  m68k: switch to using the asm-generic shmparam.h
  m68k: switch to using the asm-generic spinlock.h
  m68k: switch to using the asm-generic hw_irq.h
  arch/m68k: remove CONFIG_EXPERIMENTAL
2012-12-13 13:23:33 -08:00
..
.gitignore m68k: Add vmlinux.lds to .gitignore 2009-01-12 20:56:32 +01:00
asm-offsets.c m68k: remove thread_info struct from thread struct 2011-12-24 21:47:56 +10:00
dma.c m68k: add support for DMA_BIDIRECTIONAL in dma support functions 2012-07-17 15:49:40 +10:00
entry.S m68k: sanitize copy_thread(), fork/vfork/clone wrappers, switch to generic fork/vfork 2012-11-28 22:44:46 -05:00
head.S m68k/mac: early console 2011-12-10 19:52:45 +01:00
ints.c Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
irq.c Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
m68k_ksyms.c m68k: handle presence of 64bit mul/div instructions cleanly 2011-12-24 21:47:57 +10:00
Makefile m68k: common PCI support definitions and code 2012-07-17 15:49:41 +10:00
module.c module.c: spelling s/postition/position/g 2012-07-20 10:38:35 +02:00
module.lds m68k: runtime patching infrastructure 2007-05-31 07:58:13 -07:00
pcibios.c PCI: Provide a default pcibios_update_irq() 2012-09-18 17:28:21 -06:00
process.c flagday: kill pt_regs argument of do_fork() 2012-11-29 00:01:08 -05:00
ptrace.c m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types 2012-06-12 11:58:29 +10:00
setup_mm.c m68k: add ColdFire FPU support for the V4e ColdFire CPUs 2011-12-30 10:20:47 +10:00
setup_no.c m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} 2012-06-27 09:59:43 +02:00
setup.c m68k: merge m68k and m68knommu arch directories 2011-03-25 14:05:13 +10:00
signal.c get rid of ptrace_signal_deliver() arguments 2012-11-29 00:01:24 -05:00
sun3-head.S m68k: arch/m68k/kernel/sun3-head.S needs <linux/init.h> 2009-04-28 16:07:18 -07:00
sys_m68k.c m68k: switch to generic sys_execve()/kernel_execve() 2012-10-01 00:44:44 -04:00
syscalltable.S m68k: sanitize copy_thread(), fork/vfork/clone wrappers, switch to generic fork/vfork 2012-11-28 22:44:46 -05:00
time.c m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR 2012-08-18 15:16:00 +02:00
traps.c m68k/sun3: Fix instruction faults 2012-11-14 08:50:57 +01:00
vectors.c Disintegrate asm/system.h for M68K 2012-03-28 18:30:02 +01:00
vmlinux-nommu.lds m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} 2012-06-27 09:59:43 +02:00
vmlinux-std.lds m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} 2012-06-27 09:59:43 +02:00
vmlinux-sun3.lds m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} 2012-06-27 09:59:43 +02:00
vmlinux.lds.S m68k: use non-MMU linker script for ColdFire MMU builds 2011-12-30 10:20:44 +10:00