Russell King df762eccba Merge branch 'devel-stable' into for-next ... Conflicts: arch/arm/include/asm/atomic.h arch/arm/include/asm/hardirq.h arch/arm/kernel/smp.c		2013-11-12 10:58:59 +00:00
..
asm	Merge branch 'devel-stable' into for-next	2013-11-12 10:58:59 +00:00
debug	Merge branch 'devel-stable' into for-next	2013-11-12 10:58:59 +00:00
uapi/asm	ARM: perf: add support for perf registers API	2013-09-30 16:41:50 +01:00