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
..
asm	Merge branch 'devel-stable' into for-next	2015-06-12 21:18:57 +01:00
debug	General cleanups for MSM/QCOM for 4.1	2015-04-03 13:20:42 -07:00
uapi/asm	This mostly includes the PPC changes for 4.1, which this time cover	2015-04-26 13:06:22 -07:00