tree 48319c0a53dd76dc2dff6cb15da5c5f145e72cc3
parent 970d96f9a81b0dd83ddd8bce0e5e1ba31881c5f5
parent bcc8fa83136969c340a8057c44b1d5eb2f4b5295
author Russell King <rmk+kernel@arm.linux.org.uk> 1434140337 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1434140337 +0100

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/kernel/perf_event_cpu.c