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

This is the 3.10.34 stable release

Conflicts:
	arch/x86/kernel/head_32.S

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/head_32.S
Simple merge

diff --cc arch/x86/kernel/head_64.S
Simple merge

diff --cc arch/x86/kernel/i387.c
Simple merge

diff --cc arch/x86/kvm/svm.c
Simple merge

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

diff --cc drivers/firewire/core-device.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.h
Simple merge

diff --cc drivers/net/ethernet/sfc/ptp.c
Simple merge

diff --cc fs/namei.c
index b28ec8ae266704e33ab8a95020b9015d079b8f72,1211ee5a1cb342b1c9de2dd0c4a684d505c6426b..0e8539c03dd5d1b9f5bf5fa7b1e7888a356c4de4
--- 1/fs/namei.c
--- 2/fs/namei.c
+++ b/fs/namei.c
@@@ -3839,12 -3652,10 +3839,13 @@@ retry
        if (error)
                goto out_dput;
        error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
 +      if (!error)
 +              gr_handle_create(new_dentry, new_path.mnt);
  out_dput:
 +      putname(to);
        done_path_create(&new_path, new_dentry);
        if (retry_estale(error, how)) {
+               path_put(&old_path);
                how |= LOOKUP_REVAL;
                goto retry;
        }

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc ipc/msg.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

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

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge