From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 12 Jun 2015 20:18:57 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: kvm-4.2-2~78^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=27a513ca8600e96790f9f3a3c3182da947e569d2;p=users%2Fdwmw2%2Flinux.git

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/kernel/perf_event_cpu.c
---

27a513ca8600e96790f9f3a3c3182da947e569d2