Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ... Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c Merge reason: we gathered a few conflicts plus update to latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-01 21:06:21 +02:00
..
8xx	cpumask: remove references to struct irqaction's mask field.	2009-03-30 22:05:14 +10:30
40x	powerpc/virtex: Add uImage to the default images list	2009-05-14 10:23:10 -06:00
44x	powerpc/virtex: Add uImage to the default images list	2009-05-14 10:23:10 -06:00
52xx	Merge commit 'gcl/next' into next	2009-03-20 16:27:57 +11:00
82xx	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
83xx	powerpc/fsl_soc: isolate legacy fsl_spi support to mpc832x_rdb boards	2009-04-01 08:59:23 -07:00
85xx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-03-30 18:00:26 -07:00
86xx	powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes	2009-03-24 08:35:18 -05:00
512x	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
amigaone	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
cell	powerpc/cell: Make ptcal more reliable	2009-05-15 16:43:42 +10:00
chrp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-03-30 18:00:26 -07:00
embedded6xx	Merge commit 'origin/master' into next	2009-03-24 13:38:30 +11:00
iseries	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2009-05-15 08:05:37 -07:00
maple	powerpc/maple: Add a quirk to disable MSI for IPR on Bimini	2009-05-22 16:01:11 +10:00
pasemi	powerpc/pasemi: Fix build error on UP	2009-04-22 14:56:35 +10:00
powermac	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask	2009-03-30 18:00:26 -07:00
prep	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
ps3	powerpc/ps3: Fix build error on UP	2009-04-28 13:53:29 +10:00
pseries	irq: change ->set_affinity() to return status	2009-04-28 12:21:16 +02:00
fsl_uli1575.c	powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD	2009-04-21 15:34:43 -05:00
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-04-03 15:24:35 -07:00
Kconfig.cputype	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
Makefile	powerpc/amigaone: Add platform support for AmigaOne	2009-02-11 16:00:08 +11:00