Merge tag 'v3.10.46' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Tue, 1 Jul 2014 10:19:52 +0000 (11:19 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 1 Jul 2014 10:19:52 +0000 (11:19 +0100)
This is the 3.10.46 stable release

1  2 
arch/arm64/kernel/ptrace.c
include/linux/irqdesc.h

Simple merge
Simple merge