Broke it
Added needed msm_media_info.h
Linaro GCC 4.9.1: fix compilation errors

Signed-off-by: flar2 <asegaert@gmail.com>
Linaro GCC 4.7 -o3 fixes

Signed-off-by: flar2 <asegaert@gmail.com>
Merge nfs containerization work from Trond's tree

The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.

Conflicts:
	fs/nfsd/nfs4proc.c
	fs/nfsd/nfs4state.c
	fs/nfsd/nfs4xdr.c
Makefile adjustments

Conflicts:
	Makefile
	arch/arm/vfp/Makefile
Merge branch 'lp' of https://github.com/BrokenOs/kernel_asus_flo into lp