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
..
2006-01-08 20:14:02 -08:00
2006-03-21 08:52:18 -08:00
2006-01-13 09:12:21 -08:00
2006-03-24 07:33:20 -08:00
2006-03-28 09:16:05 -08:00
2006-03-23 07:38:09 -08:00
2006-03-27 08:44:59 -08:00
2006-06-22 15:05:57 -07:00
2006-03-27 08:44:59 -08:00
2006-06-08 15:14:23 -07:00
2006-03-31 12:18:54 -08:00
2006-01-18 19:20:29 -08:00
2006-06-22 15:05:57 -07:00
2005-11-10 02:26:41 +01:00
2006-03-26 08:56:56 -08:00
2006-03-27 08:44:51 -08:00
2005-11-08 17:14:08 +01:00
2005-11-08 09:40:47 -08:00
2006-03-20 17:09:11 -08:00
2006-03-20 22:41:23 -08:00
2006-01-06 13:24:54 -08:00
2006-06-20 20:24:58 -07:00
2006-02-08 01:03:52 -05:00
2006-01-06 13:24:29 -08:00
2006-03-20 22:21:10 -08:00
2006-06-21 12:40:49 -07:00
2005-10-30 17:37:17 -08:00
2006-04-29 18:33:15 -07:00
2006-03-23 07:38:12 -08:00
2006-06-05 12:29:17 -07:00
2005-10-28 08:16:47 -07:00
2006-03-22 07:53:57 -08:00
2006-03-23 07:38:14 -08:00
2006-03-23 07:38:14 -08:00
2006-03-20 13:44:40 -05:00
2006-03-20 13:44:27 -05:00
2006-06-22 15:05:56 -07:00
2006-03-27 08:44:48 -08:00
2006-05-04 06:55:12 +02:00
2005-11-07 07:53:46 -08:00
2006-03-27 08:44:51 -08:00
2005-10-30 11:14:39 +11:00
2006-06-17 21:29:55 -07:00
2006-03-23 07:38:12 -08:00
2005-10-30 17:37:32 -08:00
2006-04-02 00:08:05 -05:00
2005-11-07 07:53:37 -08:00
2006-03-28 09:16:05 -08:00
2005-10-30 17:37:32 -08:00
2006-03-26 08:57:03 -08:00
2006-03-31 12:18:56 -08:00
2006-01-12 14:06:38 -08:00
2006-01-10 08:01:59 -08:00
2006-03-23 07:38:14 -08:00
2005-10-29 21:40:35 -07:00
2006-03-23 07:12:57 -05:00