2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
linux-next/drivers/clocksource
Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-27 17:28:43 +01:00
..
acpi_pm.c x86: move mach-default/*.h files to asm/ 2009-01-29 14:16:51 +01:00
cyclone.c x86: move mach-default/*.h files to asm/ 2009-01-29 14:16:51 +01:00
Makefile sh: CMT clockevent platform driver 2009-01-29 16:56:32 +09:00
scx200_hrt.c [PATCH] clocksource: replace is_continuous by a flag field 2007-02-16 08:13:57 -08:00
sh_cmt.c sh: CMT clockevent platform driver 2009-01-29 16:56:32 +09:00
tcb_clksrc.c cpumask: convert struct clock_event_device to cpumask pointers. 2008-12-13 21:20:26 +10:30