Linux 3.4.80
Linux 3.4.81

Conflicts:

	kernel/trace/ftrace.c
	mm/internal.h
	mm/page_alloc.c