From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 6 Jun 2015 00:20:54 +0000 (+0100)
Subject: Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bcc8fa83136969c340a8057c44b1d5eb2f4b5295;p=linux-beck.git

Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable

There's quite a lot here, most of it from Mark Rutland, who has been
working on big.LITTLE PMU support for a while now. His work also brings
us significantly closer to moving the bulk of the CPU PMU driver out
into drivers/, where it can be shared with arm64.

As part of this work, there is a small patch to perf/core, which has
been Acked-by PeterZ and doesn't conflict with tip/perf/core at present.
I've kept that patch on a separate branch, merged in here, so that the
tip guys can pull it too if any unexpected issues crop up.

Please note that there is a conflict with mainline, since we remove
perf_event_cpu.c. The correct resolution is also to remove the file,
since the changes there are already reflected in the rework (and this
resolution is already included in linux-next).
---

bcc8fa83136969c340a8057c44b1d5eb2f4b5295