Russell King f15bdfe4fb Merge branch 'devel-stable' into for-next ... Conflicts: arch/arm/kernel/perf_event_cpu.c		2014-08-05 10:27:25 +01:00
..
asm	Merge branch 'devel-stable' into for-next	2014-08-05 10:27:25 +01:00
debug	Samsung Exynos updates for 3.16	2014-05-30 21:44:49 -07:00
uapi/asm	ARM: 8097/1: unistd.h: relocate comments back to place	2014-07-18 12:29:31 +01:00