Merge tag 'v3.10.94' into update

This is the 3.10.94 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc arch/arm64/include/asm/ptrace.h
Simple merge

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