Fix linux merge
Building with Linaro now: All patches needed to complete build

Conflicts:
	arch/arm/configs/KT_jf_defconfig
	build_att_aosp.sh
	build_spr_aosp.sh
	build_tmo_aosp.sh
	build_vzw_aosp.sh
	fs/ecryptfs/keystore.c
	net/netfilter/xt_socket.c