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
..
spufs	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
axon_msi.c	of: Remove duplicate fields from of_platform_driver	2010-05-22 00:10:40 -06:00
beat_htab.c	powerpc: Convert beat_htab_lock to raw_spinlock	2010-02-19 14:52:31 +11:00
beat_hvCall.S
beat_interrupt.c	powerpc: Convert beatic_irq_mask_lock to raw_spinlock	2010-02-19 14:52:30 +11:00
beat_interrupt.h
beat_iommu.c	powerpc: Change archdata dma_data to a union	2009-09-24 15:31:43 +10:00
beat_smp.c
beat_spu_priv1.c
beat_syscall.h
beat_udbg.c
beat_wrapper.h
beat.c
beat.h
cbe_cpufreq_pervasive.c
cbe_cpufreq_pmi.c
cbe_cpufreq.c	powerpc/cpumask: Dynamically allocate cpu_sibling_map and cpu_core_map cpumasks	2010-05-06 17:41:56 +10:00
cbe_cpufreq.h
cbe_powerbutton.c	of: add 'of_' prefix to machine_is_compatible()	2010-02-09 08:33:00 -07:00
cbe_regs.c
cbe_thermal.c
celleb_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
celleb_pci.h
celleb_scc_epci.c
celleb_scc_pciex.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
celleb_scc_sio.c
celleb_scc_uhc.c
celleb_scc.h
celleb_setup.c
cpufreq_spudemand.c
interrupt.c	powerpc: Remove whitespace in irq chip name fields	2010-02-17 14:02:48 +11:00
interrupt.h
io-workarounds.c
io-workarounds.h
iommu.c	of: eliminate of_device->node and dev_archdata->{of,prom}_node	2010-05-18 16:10:45 -06:00
Kconfig
Makefile
pervasive.c
pervasive.h
pmu.c
qpace_setup.c
ras.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
ras.h
setup.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
smp.c
spider-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
spider-pic.c	powerpc: Remove whitespace in irq chip name fields	2010-02-17 14:02:48 +11:00
spu_base.c
spu_callbacks.c
spu_fault.c
spu_manage.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
spu_notify.c
spu_priv1_mmio.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
spu_priv1_mmio.h
spu_syscalls.c