Merge branch 'odroidxu-3.4.y-android' of github.com:hardkernel/linux into odroidxu-3.4.y-android
building comfirm
Merge branch 'master' of github.com:andro-med/kernel

Conflicts:
	arch/arm/boot/Image
	arch/arm/boot/compressed/piggy.gzip
	arch/arm/boot/compressed/vmlinux
	arch/arm/boot/zImage