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
..
8xx	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
40x	powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC	2009-08-31 09:15:51 -04:00
44x	powerpc/4xx: Simple platform for the ISS 4xx simulator	2010-05-05 11:11:56 -04:00
52xx	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
82xx	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
83xx	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
85xx	powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n	2010-04-19 23:12:21 -05:00
86xx	powerpc/8610: add probing for individual DMA channels, not just DMA controllers	2010-05-17 10:55:33 -05:00
512x	Merge commit 'gcl/next' into next	2010-02-19 14:38:23 +11:00
amigaone	kbuild: move utsrelease.h to include/generated	2009-12-12 13:08:15 +01:00
cell	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
chrp	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
embedded6xx	Powerpc: wii: Fix typo in comment	2010-04-26 11:53:54 +02:00
iseries	powerpc: Avoid bad relocations in iSeries code	2010-05-21 17:31:08 +10:00
maple	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
pasemi	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
powermac	powerpc: Use common cpu_die (fixes SMP+SUSPEND build)	2010-05-21 17:31:08 +10:00
prep	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
ps3	of: eliminate of_device->node and dev_archdata->{of,prom}_node	2010-05-18 16:10:45 -06:00
pseries	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
fsl_uli1575.c	PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs	2010-02-23 09:43:31 -08:00
Kconfig	powerpc/85xx: Kconfig cleanup	2009-11-20 16:45:27 -06:00
Kconfig.cputype	powerpc/47x: Base ppc476 support	2010-05-05 09:11:10 -04:00
Makefile	powerpc/85xx: Kconfig cleanup	2009-11-20 16:45:27 -06:00