diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 16:47:51 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 16:47:51 +0200 |
| commit | 11f52002bfb4ceef26f04ab46cabd37e90f6b1ed (patch) | |
| tree | b92358373fb12166fc59f3d9b9251f1434fb0f9f /mm/swap_state.c | |
| parent | a746568e5173214f0fa1b532c6c2f12482bc637f (diff) | |
| parent | 57006d3e6f62def53c01ae3ffc338caebd866e89 (diff) | |
| download | op-kernel-dev-11f52002bfb4ceef26f04ab46cabd37e90f6b1ed.zip op-kernel-dev-11f52002bfb4ceef26f04ab46cabd37e90f6b1ed.tar.gz | |
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
Diffstat (limited to 'mm/swap_state.c')
0 files changed, 0 insertions, 0 deletions
