1
linux/arch/powerpc/platforms
Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-27 17:28:43 +01:00
..
8xx powerpc: Add support for the MPC852 based mgsuvd board from keymile. 2008-09-16 10:01:30 -05:00
40x powerpc: Introduce ppc_pci_flags accessors 2008-12-16 15:53:16 +11:00
44x powerpc/44x: Warp patches for the new NDFC driver 2009-01-20 08:17:21 -05:00
52xx powerpc/5200: Bugfix for PCI mapping of memory and IMMR 2009-01-29 17:08:41 -07:00
82xx arch/powerpc: Eliminate double sizeof 2009-02-06 10:44:28 -06:00
83xx powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed 2009-01-26 15:35:06 -06:00
85xx powerpc/85xx: Add local_irq_restore in error handling code 2008-12-30 11:35:30 -06:00
86xx powerpc: Run sbc610 USB fixup code only on the appropriate platform. 2009-03-04 17:36:52 +11:00
512x powerpc/mpc5121: fix NULL test in mpc5121_clk_get utility function. 2009-01-09 15:49:04 -07:00
cell Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-03-26 16:06:50 -07:00
chrp powerpc: Introduce ppc_pci_flags accessors 2008-12-16 15:53:16 +11:00
embedded6xx powerpc: fix linkstation and storcenter compilation breakage 2009-03-09 11:10:58 -05:00
iseries powerpc: Change u64/s64 to a long long integer type 2009-01-13 14:47:59 +11:00
maple powerpc: Remove default kexec/crash_kernel ops assignments 2008-12-23 15:13:28 +11:00
pasemi powerpc: Fix cpufreq drivers after cpufreq core changes 2009-01-11 21:32:01 -08:00
powermac powerpc/powermac: Fix occasional SMP boot failure 2009-01-13 14:48:03 +11:00
prep
ps3 PS3: replace bus_id usage 2009-03-24 16:38:23 -07:00
pseries Merge branch 'linus' into x86/apic 2009-02-13 09:44:22 +01:00
fsl_uli1575.c powerpc: Fix the ide suspend function in uli1575 2009-01-07 09:18:52 -06:00
Kconfig powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/ 2009-01-13 17:46:31 -06:00
Kconfig.cputype powerpc/85xx: Enable SMP support 2008-12-30 11:30:41 -06:00
Makefile powerpc: Remove use of CONFIG_PPC_MERGE 2008-08-04 13:18:17 +10:00