kevin/linux
1
Fork 0
Code
ce7d022619
linux/arch/powerpc/sysdev
History
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 powerpc: Remove whitespace in irq chip name fields 2010-02-17 14:02:48 +11:00
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 [MTD] [NAND] FSL-UPM: add multi chip support 2009-04-06 07:17:09 -07:00
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 powerpc/fsl: Setup PCI inbound window based on actual amount of memory 2009-05-19 00:50:44 -05:00
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 powerpc/85xx: Kconfig cleanup 2009-11-20 16:45:27 -06:00
fsl_soc.h
grackle.c of: add 'of_' prefix to machine_is_compatible() 2010-02-09 08:33:00 -07:00
i8259.c powerpc: Convert i8259_lock to raw_spinlock 2010-02-19 14:52:31 +11:00
indirect_pci.c powerpc/pci: Clean up direct access to sysdata by indirect ops 2009-05-21 15:44:22 +10:00
ipic.c powerpc: Convert ipic_lock to raw_spinlock 2010-02-19 14:52:31 +11:00
ipic.h
Kconfig
Makefile powerpc/85xx/86xx: Add suspend/resume support 2009-11-11 21:43:28 -06:00
micropatch.c
mmio_nvram.c powerpc/nvram: Allow byte length reads from mmio NVRAM driver 2009-08-20 10:29:22 +10:00
mpc5xxx_clocks.c powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function 2009-06-17 00:30:22 -06:00
mpc8xx_pic.c powerpc: Remove whitespace in irq chip name fields 2010-02-17 14:02:48 +11:00
mpc8xx_pic.h
mpc8xxx_gpio.c powerpc: Add interrupt support to mpc8xxx_gpio 2010-05-17 10:48:28 -05:00
mpic_msi.c powerpc: Fix MSI support on U4 bridge PCIe slot 2009-12-18 14:55:43 +11:00
mpic_pasemi_msi.c powerpc: Remove whitespace in irq chip name fields 2010-02-17 14:02:48 +11:00
mpic_u3msi.c powerpc: Fix MSI support on U4 bridge PCIe slot 2009-12-18 14:55:43 +11:00
mpic.c powerpc/cpumask: Convert mpic driver to new cpumask API 2010-05-06 18:01:46 +10:00
mpic.h irq: change ->set_affinity() to return status, fix 2009-05-06 07:55:33 +02:00
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 powerpc: Add coherent_dma_mask to mv64x60 devices 2010-02-17 14:02:47 +11:00
mv64x60_pci.c sysfs: add struct file* to bin_attr callbacks 2010-05-21 09:37:31 -07:00
mv64x60_pic.c powerpc: Remove get_irq_desc() 2009-10-30 17:20:55 +11:00
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 powerpc: Remove whitespace in irq chip name fields 2010-02-17 14:02:48 +11:00
xilinx_intc.c powerpc: Make "intspec" pointers in irq_host->xlate() const 2009-12-09 17:10:37 +11:00
xilinx_pci.c powerpc/virtex: Add support for Xilinx PCI host bridge 2009-06-06 10:14:22 -06:00