Linux 3.4.81

Conflicts:

	kernel/trace/ftrace.c
	mm/internal.h
	mm/page_alloc.c
Linux 3.4.82
Merge branch 'aosp-normal' of https://github.com/raden/kernel_msm into aosp-normal