Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
cpu	microblaze: Remove compilation warnings in cache macro	2010-05-13 10:55:47 +02:00
Makefile	microblaze: Support DMA	2010-03-11 13:56:29 +01:00
asm-offsets.c	microblaze: Remove "cache" optimized copy_page function	2010-05-06 11:21:58 +02:00
dma.c	microblaze: Fix consistent code	2010-05-06 11:21:59 +02:00
early_printk.c	microblaze_mmu_v2: Alocate TLB for early console	2009-05-26 16:45:14 +02:00
entry-nommu.S	microblaze: re-enable interrupts before calling schedule	2010-05-13 09:21:01 +02:00
entry.S	microblaze: entry.S use delay slot for return handlers	2010-03-11 14:26:13 +01:00
exceptions.c	microblaze: fix divide by zero exception message	2010-05-06 11:21:58 +02:00
ftrace.c	microblaze: Fix ftrace_update_ftrace_func panic	2010-04-07 07:27:25 +02:00
head.S	microblaze: Quiet section mismatch warnings	2010-05-06 11:21:57 +02:00
heartbeat.c	microblaze: Fix the heartbeat gpio to be more robust	2009-12-14 08:45:03 +01:00
hw_exception_handler.S	microblaze: Use instruction with delay slot	2010-04-01 08:38:23 +02: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 interrupt ACKing	2009-12-14 08:45:06 +01:00
irq.c	microblaze: Fix IRQ entry/exit ftracing	2010-05-06 11:21:57 +02:00
mcount.S	microblaze: ftrace: Add dynamic function graph tracer	2009-12-14 08:44:54 +01:00
microblaze_ksyms.c	microblaze: export assembly functions used by modules	2010-05-13 12:11:42 +02:00
misc.S	microblaze: Remove "cache" optimized copy_page function	2010-05-06 11:21:58 +02:00
module.c	microblaze: Fix module loading on system with WB cache	2010-05-14 07:43:38 +02:00
of_device.c	arch/microblaze: Move dma_mask from of_device into pdev_archdata	2010-05-22 00:10:40 -06:00
of_platform.c	arch/microblaze: Move dma_mask from of_device into pdev_archdata	2010-05-22 00:10:40 -06:00
process.c	microblaze: Adding likely macros	2010-04-01 08:38:24 +02:00
prom.c	of: move definition of of_chosen into common code.	2010-02-14 07:13:55 -07:00
prom_parse.c	microblaze: pci_controller->arch_data really is a struct device_node *	2010-01-18 16:36:07 +01:00
ptrace.c	microblaze: Remove unused variable from ptrace	2010-04-07 15:47:55 +02:00
reset.c	microblaze: Support both levels for reset	2009-12-14 08:44:56 +01:00
selfmod.c	microblaze_v8: Selfmodified code	2009-03-27 14:25:15 +01:00
setup.c	microblaze: Print early printk information to log buffer	2010-04-01 08:38:25 +02:00
signal.c	microblaze: Remove rt_sigsuspend wrapper	2009-12-14 08:45:12 +01:00
stacktrace.c	microblaze: Stack trace support	2009-12-14 08:40:09 +01:00
sys_microblaze.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
syscall_table.S	microblaze: Enable accept4 syscall	2010-01-18 16:35:27 +01:00
timer.c	microblaze: Register timecounter/cyclecounter	2009-12-14 08:40:09 +01:00
traps.c	microblaze: Remove ancient code	2010-05-06 11:21:58 +02:00
vmlinux.lds.S	microblaze: Quiet section mismatch warnings	2010-05-06 11:21:57 +02:00