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
asm-offsets.c
dma.c
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
ints.c
irq.c
m68k_ksyms.c
Makefile
module.c
module.lds
pcibios.c
process.c	flagday: kill pt_regs argument of do_fork()	2012-11-29 00:01:08 -05:00
ptrace.c
setup_mm.c
setup_no.c
setup.c
signal.c	get rid of ptrace_signal_deliver() arguments	2012-11-29 00:01:24 -05:00
sun3-head.S
sys_m68k.c
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
traps.c	m68k/sun3: Fix instruction faults	2012-11-14 08:50:57 +01:00
vectors.c
vmlinux-nommu.lds
vmlinux-std.lds
vmlinux-sun3.lds
vmlinux.lds.S