linux/arch/microblaze/kernel
Thomas Gleixner a18f22a968 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource
Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2011-05-14 12:06:36 +02:00
..
cpu Fix common misspellings 2011-03-31 11:26:23 -03:00
Makefile microblaze: Fix ftrace 2011-04-01 09:34:51 +02:00
asm-offsets.c microblaze: Remove "cache" optimized copy_page function 2010-05-06 11:21:58 +02:00
dma.c microblaze: Add support for DMA_BIDIRECTIONAL 2011-03-09 08:09:57 +01:00
early_printk.c microblaze: Support early console on uart16550 2010-10-21 15:51:53 +10:00
entry-nommu.S microblaze: Do not use "la" pseudo instruction - use addik instead 2011-03-09 08:09:54 +01:00
entry.S microblaze: Do not copy reset vectors/manual reset vector setup 2011-03-15 10:59:00 +01:00
exceptions.c microblaze: Fix sparse warning - sw_exceptions 2011-03-09 08:09:58 +01:00
ftrace.c microblaze: Fix ftrace 2011-04-01 09:34:51 +02:00
head.S microblaze: Do not use "la" pseudo instruction - use addik instead 2011-03-09 08:09:54 +01:00
heartbeat.c microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
hw_exception_handler.S microblaze: Do not use "la" pseudo instruction - use addik instead 2011-03-09 08:09:54 +01:00
init_task.c Use new __init_task_data macro in arch init_task.c files. 2009-09-21 06:27:08 +02:00
intc.c microblaze: Fix level/edge irq sensibility 2011-04-01 09:25:04 +02:00
irq.c microblaze: Use generic show_interrupts() 2011-03-29 14:48:06 +02:00
kgdb.c microblaze: KGDB little endian support 2010-10-21 15:51:58 +10:00
mcount.S microblaze: ftrace: Add dynamic function graph tracer 2009-12-14 08:44:54 +01:00
microblaze_ksyms.c microblaze: Add missing export symbols for lib functions 2011-03-09 08:09:59 +01:00
misc.S microblaze: Fix comment for TLB 2010-08-02 10:44:03 +02:00
module.c microblaze: Fix module loading on system with WB cache 2010-05-14 07:43:38 +02:00
process.c microblaze: Remove r0_ram pointer and PTO alignment 2011-03-09 08:09:54 +01:00
prom.c microblaze: Fix sparse warning - prom.c 2011-03-09 08:09:57 +01:00
prom_parse.c of/pci: move of_irq_map_pci() into generic code 2011-02-04 11:46:50 -07:00
ptrace.c microblaze: Fix sparse warnings - ptrace 2011-03-09 08:09:58 +01:00
reset.c of/gpio: stop using device_node data pointer to find gpio_chip 2010-07-05 16:14:30 -06:00
selfmod.c microblaze_v8: Selfmodified code 2009-03-27 14:25:15 +01:00
setup.c microblaze: Do not copy reset vectors/manual reset vector setup 2011-03-15 10:59:00 +01:00
signal.c microblaze: Fix sparse warnings - signal.c 2011-03-09 08:09:59 +01:00
stacktrace.c microblaze: Add stack unwinder 2010-08-04 10:22:35 +02:00
sys_microblaze.c microblaze: Fix missing microblaze specific syscalls declaration 2011-03-09 08:09:58 +01:00
syscall_table.S microblaze: Wire up new syscalls 2011-04-01 09:25:05 +02:00
timer.c Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
traps.c microblaze: Add stack unwinder 2010-08-04 10:22:35 +02:00
unwind.c microblaze: Fix sparse warning - unwind.c 2011-03-09 08:09:58 +01:00
vmlinux.lds.S microblaze: Remove r0_ram pointer and PTO alignment 2011-03-09 08:09:54 +01:00