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)
commitd1a76187a5be4f89c6cb19d800cb5fb7aac735c5
tree2fac3ffbfffc7560eeef8364b541d0d7a0057920
parentc7e78cff6b7518212247fb20b1dc6411540dc9af
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92
Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
arch/um/include/asm/system.h
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