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-01-07 20:31:54 +00:00
2015-03-25 09:53:43 +01:00
2014-11-21 15:24:50 +00:00
2014-11-21 15:24:50 +00:00
2014-11-21 15:24:50 +00:00
2015-06-12 21:18:38 +01:00
2014-11-21 15:25:02 +00:00
2014-11-21 15:24:50 +00:00
2015-06-01 23:48:19 +01:00
2014-11-21 15:24:50 +00:00
2014-11-21 15:24:50 +00:00
2015-06-02 09:58:19 +01:00
2015-04-16 13:58:29 -05:00