Merge tag v3.10.42 into linux-linaro-lsk

This is the 3.10.42 stable release

diff --cc drivers/clk/versatile/clk-vexpress-osc.c
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge

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

diff --cc kernel/workqueue.c
Simple merge