]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge commit 'v2.6.28-rc2' into core/locking
authorIngo Molnar <mingo@elte.hu>
Tue, 28 Oct 2008 15:54:49 +0000 (16:54 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 28 Oct 2008 15:54:49 +0000 (16:54 +0100)
Conflicts:
arch/um/include/asm/system.h

1  2 
arch/um/include/asm/system.h
arch/x86/include/asm/uaccess.h
arch/x86/include/asm/uaccess_32.h
arch/x86/include/asm/uaccess_64.h
arch/x86/lib/usercopy_32.c
include/linux/kernel.h
kernel/sched.c
mm/memory.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc mm/memory.c
Simple merge