45c091bb2d
* 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 |
||
|---|---|---|
| .. | ||
| hv_call.h | ||
| hv_call_event.h | ||
| hv_call_sc.h | ||
| hv_call_xm.h | ||
| hv_lp_config.h | ||
| hv_lp_event.h | ||
| hv_types.h | ||
| iommu.h | ||
| iseries_io.h | ||
| it_exp_vpd_panel.h | ||
| it_lp_naca.h | ||
| it_lp_queue.h | ||
| it_lp_reg_save.h | ||
| lpar_map.h | ||
| mf.h | ||
| vio.h | ||