Linus Torvalds da457d4b93 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (27 commits) [POWERPC] 83xx: Update mpc8349emitx(gp) defconfig for USB [POWERPC] 83xx: Update mpc832x_rdb_defconfig to enable MMC-over-SPI [POWERPC] 83xx: MPC832x RDB - remove spidev stub, use mmc_spi [POWERPC] 8xxx: MDS board RTC fixes [POWERPC] Fix 8xx build breakage due to _tlbie changes [POWERPC] Fix device tree interrupt map for Freescale ULI1575 boards [POWERPC] Fix possible division by zero in scaled time accounting [POWERPC] spufs: Fix context destroy vs /spu readdir race [POWERPC] Fix RTAS os-term usage on kernel panic [POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum [POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types [POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts [POWERPC] 83xx: mpc832x mds: Fix board PHY reset code [POWERPC] Fix potential NULL dereference [POWERPC] vdso: Fixes for cache block sizes [POWERPC] pasemi: Don't reset mpic at boot [POWERPC] Fix kmalloc alignment on non-coherent DMA platforms [POWERPC] Fix build failure on legacy iSeries [POWERPC] 4xx: Use virtual PVR value to init FPU on arch/ppc 440EP [POWERPC] 4xx: UIC add mask_ack callback ...		2007-11-26 19:08:35 -08:00
..
alpha	alpha: sg_virt() fallout	2007-10-23 12:31:05 +02:00
arm	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2007-11-16 18:32:08 -08:00
avr32	[AVR32] Export intc_get_pending symbol	2007-11-15 13:47:20 +01:00
blackfin	Blackfin arch: reclaim a few bytes from the end of our init section	2007-10-30 12:00:02 +08:00
cris	CRISv10 fasttimer: Scrap INLINE and name timeval_cmp better	2007-11-14 18:45:47 -08:00
frv	FRV: Remove the section annotation on free_initmem()	2007-11-09 15:02:25 -08:00
h8300	Kbuild/doc: fix links to Documentation files	2007-10-30 14:26:30 -07:00
ia64	Add IORESOUCE_BUSY flag for System RAM	2007-11-14 18:45:39 -08:00
m32r	spelling fixes: arch/m32r/	2007-10-20 01:14:39 +02:00
m68k	m68k: sg fallout	2007-10-24 08:55:40 +02:00
m68knommu	m68knommu: mark mem init functions as __init	2007-10-23 20:45:44 -07:00
mips	[MIPS] vpe: Add missing "space"	2007-11-26 17:26:15 +00:00
parisc	parisc: fix sg_page() fallout	2007-10-23 09:49:31 +02:00
powerpc	[POWERPC] 83xx: Update mpc8349emitx(gp) defconfig for USB	2007-11-20 15:39:54 -06:00
ppc	[POWERPC] Fix 8xx build breakage due to _tlbie changes	2007-11-20 18:42:00 +11:00
s390	sched: restore deterministic CPU accounting on powerpc	2007-11-09 22:39:38 +01:00
sh	Merge branch 'page_colouring_despair'	2007-11-08 17:01:42 +09:00
sh64	sh64: Kill off duplicate includes.	2007-11-05 12:18:17 +09:00
sparc	[SPARC]: Remove duplicate includes.	2007-11-06 21:23:11 -08:00
sparc64	[SPARC]: Remove duplicate includes.	2007-11-06 21:23:11 -08:00
um	uml: fix build for !CONFIG_PRINTK	2007-11-14 18:45:43 -08:00
v850	spelling fixes: arch/v850/	2007-10-20 01:24:05 +02:00
x86	x86: correctly set UTS_MACHINE for "make ARCH=x86"	2007-11-26 17:38:53 -08:00
xtensa	Kbuild/doc: fix links to Documentation files	2007-10-30 14:26:30 -07:00