You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		16 years ago
..
boot	crypto: amcc - Add crypt4xx driver	16 years ago
configs	powerpc/ps3: ps3_defconfig updates	16 years ago
include/asm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	16 years ago
kernel	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	16 years ago
kvm	KVM: ppc: e500: Fix the bug that KVM is unstable in SMP	16 years ago
lib	powerpc: Fix 64bit __copy_tofrom_user() regression	16 years ago
math-emu	powerpc: Add SPE/EFP math emulation for E500v1/v2 processors.	16 years ago
mm	powerpc/mm: Fix numa reserve bootmem page selection	16 years ago
oprofile	powerpc/cell: Add missing #include for oprofile	16 years ago
platforms	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	16 years ago
sysdev	Merge branch 'x86/urgent' into x86/pat	16 years ago
xmon	powerpc: Prepare xmon_save_regs for use with kdump	16 years ago
Kconfig	powerpc: Remove arch/ppc cruft from Kconfig	16 years ago
Kconfig.debug	powerpc: Allow the max stack trace depth to be configured	16 years ago
Makefile	powerpc: Remove unncessary SPE related compiler flag	16 years ago