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
..
8xx_immap.h
amigahw.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
amigaints.h
amigappc.h
amigayle.h
amipcmcia.h
ans-lcd.h
bootinfo.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
bootx.h
btext.h	[PATCH] powerpc: Unify udbg (#2)	2006-01-09 14:49:54 +11:00
commproc.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-06 19:59:18 +01:00
cpm2.h	[PATCH] ppc32 CPM_UART: Fixed break send on SCC	2006-05-03 23:06:43 +10:00
delay.h
floppy.h
gg2.h
gt64260_defs.h
gt64260.h
harrier.h	[PATCH] powerpc: trivial: modify comments to refer to new location of files	2006-02-10 16:53:51 +11:00
hawk_defs.h
hawk.h
highmem.h
hydra.h
ibm4xx.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ibm44x.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ibm403.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ibm405.h
ibm_ocp_pci.h
ibm_ocp.h	[PATCH] ppc32: remove "jumbo" member from ocp_func_emac_data	2006-01-06 08:33:30 -08:00
immap_85xx.h	[PATCH] Update email address for Kumar	2005-11-13 18:14:10 -08:00
immap_cpm2.h
io.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
kgdb.h	[PATCH] ppc: Fix ARCH=ppc build with xmon	2005-11-08 11:19:48 +11:00
m48t35.h
m8260_pci.h
machdep.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
md.h
mk48t59.h
mmu_context.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
mmu.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
mpc8xx.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mpc10x.h	[PATCH] powerpc: trivial: modify comments to refer to new location of files	2006-02-10 16:53:51 +11:00
mpc52xx_psc.h
mpc52xx.h	[PATCH] ppc32: Reorganize and complete MPC52xx initial cpu setup	2006-03-27 14:49:00 +11:00
mpc83xx.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mpc85xx.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
mpc8260_pci9.h
mpc8260.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mv64x60_defs.h
mv64x60.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ocp_ids.h
ocp.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
open_pic.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
page.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
pc_serial.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
pci-bridge.h	[PATCH] powerpc: pci_address_to_pio fix	2006-01-09 15:05:56 +11:00
pci.h	[PATCH] ppc: make phys_mem_access_prot() work with pfns instead of addresses	2005-10-29 14:25:49 +10:00
pgalloc.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
pgtable.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
pnp.h
ppc4xx_dma.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ppc4xx_pic.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ppc_sys.h	[PATCH] ppc32: odd fixes and improvements in ppc_sys	2006-04-28 21:05:16 +10:00
ppcboot.h	[PATCH] ppc32: cleanup AMCC PPC40x eval boards to support U-Boot	2005-11-07 07:53:26 -08:00
prep_nvram.h
prom.h	ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc	2006-03-28 10:22:10 +11:00
raven.h
reg_booke.h	[PATCH] ppc32: add 440GX erratum 440_43 workaround	2006-04-28 21:04:56 +10:00
residual.h
rheap.h
rio.h	[PATCH] RapidIO support: ppc32	2005-11-07 07:53:47 -08:00
rtc.h
serial.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
smp.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
spinlock.h	[PATCH] powerpc: Fix building of power3 config on ppc32	2005-09-25 22:38:45 +10:00
suspend.h
system.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge	2006-01-12 10:21:22 -08:00
time.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
todc.h	[PATCH] powerpc: trivial: modify comments to refer to new location of files	2006-02-10 16:53:51 +11:00
traps.h
zorro.h