• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 45c091bb
    Linus Torvalds authored
    * 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
    45c091bb
Kconfig 16.1 KB