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

This is the 3.10.30 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/md/dm-thin-metadata.c
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc drivers/rtc/rtc-cmos.c
Simple merge

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

diff --cc fs/fuse/dev.c
Simple merge

diff --cc fs/notify/fanotify/fanotify_user.c
Simple merge

diff --cc fs/read_write.c
Simple merge

diff --cc fs/splice.c
Simple merge

diff --cc include/linux/compat.h
index 1077986c57b9f6ce6a4c4fb843a6f3c6c6ad3635,df7060083d8535819d010fc35aca5c71fb6cbd32..c8eecb03e3110465e0e72656eef353f4e4e129e8
--- 1/include/linux/compat.h
--- 2/include/linux/compat.h
+++ b/include/linux/compat.h
@@@ -419,9 -419,9 +419,9 @@@ extern int compat_ptrace_request(struc
  extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                               compat_ulong_t addr, compat_ulong_t data);
  asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
 -                                compat_long_t addr, compat_long_t data);
 +                                compat_ulong_t addr, compat_ulong_t data);
  
- asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
+ asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
  /*
   * epoll (fs/eventpoll.c) compat bits follow ...
   */

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

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

diff --cc kernel/audit.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

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

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

diff --cc mm/memory-failure.c
Simple merge

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/slub.c
Simple merge

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

diff --cc net/sunrpc/clnt.c
Simple merge