From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 12 May 2015 14:47:51 +0000 (+0200)
Subject: Merge tag 'ccn/updates-for-4.2' of git://git.linaro.org/people/pawel.moll/linux into... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=11f52002bfb4ceef26f04ab46cabd37e90f6b1ed;p=deliverable%2Flinux.git

Merge tag 'ccn/updates-for-4.2' of git://git.linaro.org/people/pawel.moll/linux into next/drivers

Pull "Set of ARM CCN PMU driver updates" from Pawel Moll:

- fixed a nasty bitfield mangling bug
- added new hints to the perf userspace tool
- pinned events processing to a single PMU
- modified events initialisation so they can be rotated now

* tag 'ccn/updates-for-4.2' of git://git.linaro.org/people/pawel.moll/linux:
  bus: arm-ccn: Allocate event when it is being added, not initialised
  bus: arm-ccn: Do not group CCN events with other PMUs
  bus: arm-ccn: Provide required event arguments
  bus: arm-ccn: cpumask attribute
  bus: arm-ccn: Fix node->XP config conversion
---

11f52002bfb4ceef26f04ab46cabd37e90f6b1ed