fix gcc4.7 compile

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:

	arch/arm/boot/compressed/Makefile
Merge branch 'cm-10.1' of github.com:jrior001/android_kernel_htc_msm8960 into cm-10.1