Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Sun, 18 May 2014 14:03:45 +0000 (15:03 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 18 May 2014 14:03:45 +0000 (15:03 +0100)
1  2 
arch/arm64/kernel/perf_event.c

Simple merge