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
..
2015-06-12 21:18:38 +01:00
2015-05-08 17:33:47 +01:00
2015-03-19 10:17:22 -05:00
2015-04-22 09:24:55 -07:00
2015-03-19 10:17:22 -05:00
2015-03-19 10:17:22 -05:00
2015-06-12 21:18:38 +01:00