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
..
bestcomm	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
qe_lib	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
6xx-suspend.S
axonram.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
cpm1.c	powerpc/fsl-cpm: Configure clock correctly for SCC	2010-04-19 23:13:03 -05:00
cpm2_pic.c
cpm2_pic.h	powerpc/cpm2: Checkpatch cleanup	2010-03-04 10:43:58 -06:00
cpm2.c	powerpc/fsl-cpm: Configure clock correctly for SCC	2010-04-19 23:13:03 -05:00
cpm_common.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
dart_iommu.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
dart.h
dcr-low.S
dcr.c
fsl_gtm.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
fsl_lbc.c
fsl_msi.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
fsl_msi.h
fsl_pci.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
fsl_pci.h
fsl_pmc.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
fsl_rio.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
fsl_soc.c
fsl_soc.h
grackle.c
i8259.c
indirect_pci.c
ipic.c
ipic.h
Kconfig
Makefile
micropatch.c
mmio_nvram.c
mpc5xxx_clocks.c
mpc8xx_pic.c
mpc8xx_pic.h
mpc8xxx_gpio.c	powerpc: Add interrupt support to mpc8xxx_gpio	2010-05-17 10:48:28 -05:00
mpic_msi.c
mpic_pasemi_msi.c
mpic_u3msi.c
mpic.c	powerpc/cpumask: Convert mpic driver to new cpumask API	2010-05-06 18:01:46 +10:00
mpic.h
msi_bitmap.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
mv64x60_dev.c
mv64x60_pci.c	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
mv64x60_pic.c
mv64x60_udbg.c
mv64x60.h
of_rtc.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
pmi.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
ppc4xx_gpio.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
ppc4xx_pci.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
ppc4xx_pci.h
ppc4xx_soc.c	powerpc/4xx: Add optional "reset_type" property to control reboot via dts	2010-05-05 12:51:54 -04:00
rtc_cmos_setup.c
simple_gpio.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
simple_gpio.h
tsi108_dev.c
tsi108_pci.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
uic.c
xilinx_intc.c
xilinx_pci.c