Linux 3.4.12

Conflicts:
	kernel/events/core.c