![]() * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits) [POWERPC] re-enable OProfile for iSeries, using timer interrupt [POWERPC] support ibm,extended-*-frequency properties [POWERPC] Extra sanity check in EEH code [POWERPC] Dont look for class-code in pci children [POWERPC] Fix mdelay badness on shared processor partitions [POWERPC] disable floating point exceptions for init [POWERPC] Unify ppc syscall tables [POWERPC] mpic: add support for serial mode interrupts [POWERPC] pseries: Print PCI slot location code on failure [POWERPC] spufs: one more fix for 64k pages [POWERPC] spufs: fail spu_create with invalid flags [POWERPC] spufs: clear class2 interrupt status before wakeup [POWERPC] spufs: fix Makefile for "make clean" [POWERPC] spufs: remove stop_code from struct spu [POWERPC] spufs: fix spu irq affinity setting [POWERPC] spufs: further abstract priv1 register access [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts [POWERPC] spufs: dont try to access SPE channel 1 count [POWERPC] spufs: use kzalloc in create_spu [POWERPC] spufs: fix initial state of wbox file ... Manually resolved conflicts in: drivers/net/phy/Makefile include/asm-powerpc/spu.h |
||
---|---|---|
.. | ||
8xx_immap.h | ||
amigahw.h | ||
amigaints.h | ||
amigappc.h | ||
amigayle.h | ||
amipcmcia.h | ||
ans-lcd.h | ||
bootinfo.h | ||
bootx.h | ||
btext.h | ||
commproc.h | ||
cpm2.h | ||
delay.h | ||
floppy.h | ||
gg2.h | ||
gt64260.h | ||
gt64260_defs.h | ||
harrier.h | ||
hawk.h | ||
hawk_defs.h | ||
highmem.h | ||
hydra.h | ||
ibm4xx.h | ||
ibm44x.h | ||
ibm403.h | ||
ibm405.h | ||
ibm_ocp.h | ||
ibm_ocp_pci.h | ||
immap_85xx.h | ||
immap_cpm2.h | ||
io.h | ||
kgdb.h | ||
m48t35.h | ||
m8260_pci.h | ||
machdep.h | ||
md.h | ||
mk48t59.h | ||
mmu.h | ||
mmu_context.h | ||
mpc8xx.h | ||
mpc10x.h | ||
mpc52xx.h | ||
mpc52xx_psc.h | ||
mpc83xx.h | ||
mpc85xx.h | ||
mpc8260.h | ||
mpc8260_pci9.h | ||
mv64x60.h | ||
mv64x60_defs.h | ||
ocp.h | ||
ocp_ids.h | ||
open_pic.h | ||
page.h | ||
pc_serial.h | ||
pci-bridge.h | ||
pci.h | ||
pgalloc.h | ||
pgtable.h | ||
pnp.h | ||
ppc4xx_dma.h | ||
ppc4xx_pic.h | ||
ppc_sys.h | ||
ppcboot.h | ||
prep_nvram.h | ||
prom.h | ||
raven.h | ||
reg_booke.h | ||
residual.h | ||
rheap.h | ||
rio.h | ||
rtc.h | ||
serial.h | ||
smp.h | ||
spinlock.h | ||
suspend.h | ||
system.h | ||
time.h | ||
todc.h | ||
traps.h | ||
zorro.h |