Merge

diff --cc arch/ppc64/kernel/sys_ppc32.c
Simple merge

diff --cc arch/s390/kernel/compat_linux.c
Simple merge

diff --cc arch/s390/kernel/compat_wrapper.S
Simple merge

diff --cc arch/sparc64/kernel/sys_sparc32.c
Simple merge

diff --cc arch/x86_64/ia32/sys_ia32.c
Simple merge