Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-25 14:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
8d84981e39
linux/arch/m68k/kernel
History
Olof Johansson 8d84981e39 Merge branch 'clocksource/cleanup' into next/cleanup 
Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-pxa/time.c
2013-01-14 10:20:02 -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 ARCH: drivers remove __dev* attributes. 2013-01-03 15:57:13 -08: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: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07: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: set arch_gettimeoffset directly 2012-12-24 09:36:34 -07: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