Merge tag 'v3.10.2' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 22 Jul 2013 10:16:31 +0000 (11:16 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 22 Jul 2013 10:16:31 +0000 (11:16 +0100)
This is the 3.10.2 stable release

1  2 
arch/arm/kernel/perf_event.c

Simple merge