OpenCloudOS-Kernel/arch/powerpc
Ingo Molnar 82268da1b1 Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-28 04:26:01 +01:00
..
boot crypto: amcc - Add crypt4xx driver 2009-02-18 16:49:43 +08:00
configs powerpc/ps3: ps3_defconfig updates 2009-03-18 13:44:16 +11:00
include/asm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2009-03-27 16:23:12 -07:00
kernel Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
kvm KVM: ppc: e500: Fix the bug that KVM is unstable in SMP 2009-03-24 11:03:15 +02:00
lib powerpc: Fix 64bit __copy_tofrom_user() regression 2009-02-26 14:02:54 +11:00
math-emu powerpc: Add SPE/EFP math emulation for E500v1/v2 processors. 2008-12-03 08:19:16 -06:00
mm powerpc/mm: Fix numa reserve bootmem page selection 2009-02-13 16:37:45 +11:00
oprofile powerpc/cell: Add missing #include for oprofile 2009-02-10 14:39:08 +11:00
platforms Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
sysdev Merge branch 'x86/urgent' into x86/pat 2009-03-01 12:47:58 +01:00
xmon powerpc: Prepare xmon_save_regs for use with kdump 2008-12-23 15:13:28 +11:00
Kconfig powerpc: Remove arch/ppc cruft from Kconfig 2009-01-28 17:15:51 +11:00
Kconfig.debug powerpc: Allow the max stack trace depth to be configured 2008-12-03 20:46:35 +11:00
Makefile powerpc: Remove unncessary SPE related compiler flag 2008-12-03 08:19:10 -06:00