linux/arch/powerpc
Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 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
2006-06-22 22:11:30 -07:00
..
boot Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
configs [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts 2006-06-21 15:01:31 +10:00
kernel [POWERPC] support ibm,extended-*-frequency properties 2006-06-21 15:01:33 +10:00
lib [POWERPC] Optimise some TOC usage 2006-06-15 19:31:25 +10:00
math-emu powerpc: move math-emu over to arch/powerpc 2006-03-27 23:43:27 -06:00
mm Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
oprofile [POWERPC] re-enable OProfile for iSeries, using timer interrupt 2006-06-21 15:01:33 +10:00
platforms [POWERPC] Extra sanity check in EEH code 2006-06-21 15:01:33 +10:00
sysdev Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
xmon [PATCH] powerpc: add a raw dump command to xmon 2006-03-17 13:22:33 +11:00
Kconfig [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts 2006-06-21 15:01:31 +10:00
Kconfig.debug [PATCH] powerpc: Make early debugging options behave with oldconfig 2006-05-19 14:35:23 +10:00
Makefile [POWERPC] Remove stale 64bit on 32bit kernel code 2006-06-15 19:31:26 +10:00