Merge https://github.com/cybojenix/android_kernel_htc_pico

Conflicts:

	Makefile
	arch/arm/configs/golfu_defconfig
message
message