Linux 3.4.42

Conflicts:
	arch/arm/kernel/perf_event.c

Conflicts:
	Makefile