[blomdhal] minor change
Merge branch 'master' of https://github.com/iamroot11c/kernel

Conflicts:
	arch/arm/kernel/head.S