Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:11:30 +0000 (00:11 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:11:30 +0000 (00:11 +0100)
commitfbd2e1536621360dada43a0e2af8f99b1e4c22ec
tree9dfcef86d7dfff5e87d0294b66645885d355c58c
parent3f8c76bb4ffb1092adbc75a0d3ec8831b41da562
parent078511edeb9c152d10e75233b535d730918aa213
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk

Conflicts:
arch/arm64/kernel/Makefile
arch/arm64/Kconfig
arch/arm64/include/asm/compat.h
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/perf_event.c