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
..
cpufreq.c	powerpc/cpumask: Use cpu_online_mask	2010-05-06 17:16:12 +10:00
dma_lib.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
gpio_mdio.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
idle.c	powerpc: ARRAY_SIZE changes in pasemi and powermac code	2009-08-20 10:29:23 +10:00
iommu.c	powerpc: Change archdata dma_data to a union	2009-09-24 15:31:43 +10:00
Kconfig	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
Makefile
misc.c	i2c: Switch pasemi to the new device/driver matching scheme	2008-05-18 20:49:40 +02:00
pasemi.h
pci.c
powersave.S
setup.c	of: eliminate of_device->node and dev_archdata->{of,prom}_node	2010-05-18 16:10:45 -06:00
time.c