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
..
hv_call_event.h	[PATCH] powerpc: remove bitfields from hv_call_event.h	2006-01-12 20:09:29 +11:00
hv_call_sc.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
hv_call_xm.h	modify defines according to _ASM_POWERPC_ISERIES_	2005-11-02 15:53:01 +11:00
hv_call.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
hv_lp_config.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
hv_lp_event.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
hv_types.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
iommu.h	[PATCH] powerpc: merge the rest of the vio code	2006-04-29 18:02:02 +10:00
iseries_io.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
it_exp_vpd_panel.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
it_lp_naca.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
it_lp_queue.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
it_lp_reg_save.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
lpar_map.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00
mf.h	[PATCH] powerpc: iseries: Make more stuff static in platforms/iseries/mf.c	2006-03-22 15:04:23 +11:00
vio.h	[PATCH] powercp: iSeries include file comment cleanups	2006-01-12 20:09:30 +11:00