Merge tag 'v3.10.51' into linux-3.10.x-grsecurity-2.9.1

This is the 3.10.51 stable release

Conflicts:
	arch/x86/kernel/entry_32.S

diff --cc Makefile
Simple merge

diff --cc arch/x86/boot/header.S
Simple merge

diff --cc arch/x86/kernel/entry_32.S
index b540bd15453890439e37f32210705cdb0010e087,08fa44443a013bff989316f4d5f345fe57051c23..5e0ac5875f406ef3d30c3a8e9ff4b0893a0a6218
--- 1/arch/x86/kernel/entry_32.S
--- 2/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@@ -915,17 -684,17 +916,17 @@@ syscall_fault
        GET_THREAD_INFO(%ebp)
        movl $-EFAULT,PT_EAX(%esp)
        jmp resume_userspace
 -END(syscall_fault)
 +ENDPROC(syscall_fault)
  
  syscall_badsys:
-       movl $-ENOSYS,PT_EAX(%esp)
-       jmp syscall_exit
+       movl $-ENOSYS,%eax
+       jmp syscall_after_call
 -END(syscall_badsys)
 +ENDPROC(syscall_badsys)
  
  sysenter_badsys:
-       movl $-ENOSYS,PT_EAX(%esp)
+       movl $-ENOSYS,%eax
        jmp sysenter_after_call
 -END(syscall_badsys)
 +ENDPROC(syscall_badsys)
        CFI_ENDPROC
  /*
   * End of kprobes section

diff --cc block/compat_ioctl.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc fs/coredump.c
Simple merge

diff --cc include/linux/libata.h
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/slab_common.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue_core.c
Simple merge