Linux 3.4.99

Conflicts:
	arch/powerpc/perf/core-book3s.c