Merge tag 'v3.10.99' into update

This is the 3.10.99 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

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

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

diff --cc kernel/resource.c
Simple merge

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

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

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

diff --cc kernel/workqueue.c
Simple merge

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

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

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

diff --cc scripts/recordmcount.c
Simple merge