Linux 3.4.12

Linux 3.4.12

Conflicts:
	kernel/events/core.c

Change-Id: Iff01d89bbb3b0479ed5caf4de52d9cc7bbe6a35b

fix merge

Change-Id: I3bd71f425d4536ce4cdb8456060bcfe360fc7b89