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
..
boot	microblaze: Makefile cleanups	2010-04-01 08:38:19 +02:00
configs	microblaze: Defconfig update	2010-05-06 11:37:42 +02:00
include/asm	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
kernel	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
lib	microblaze: Support word copying in copy_tofrom_user	2010-04-01 08:38:25 +02:00
mm	microblaze: export assembly functions used by modules	2010-05-13 12:11:42 +02:00
oprofile	microblaze: Core oprofile configs and hooks	2009-12-14 08:45:07 +01:00
pci	microblaze: Remove powerpc code from Microblaze port	2010-05-13 12:09:54 +02:00
platform	microblaze: Use lowest-common-denominator default CPU settings	2009-12-14 08:45:02 +01:00
Kconfig	microblaze: Kconfig Fix - pci	2010-04-01 08:38:24 +02:00
Kconfig.debug	microblaze: Add TRACE_IRQFLAGS_SUPPORT	2009-12-14 08:40:09 +01:00
Makefile	microblaze: Fix Makefile to delete build generated files	2010-04-01 08:38:19 +02:00