Russell King 27a513ca86 Merge branch 'devel-stable' into for-next
Conflicts:
	arch/arm/kernel/perf_event_cpu.c
2015-06-12 21:18:57 +01:00
..
2014-12-09 14:48:22 -08:00
2014-12-14 16:10:09 -08:00