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

..

common.c

Merge branch 'devel-stable' into for-next

2014-08-05 10:27:25 +01:00

Makefile

…