Merge commit 'bfa76d49576599a4b9f9b7a71f23d73d6dcff735' into
v3.19-n900

Merge v3.19

Conflicts:
	arch/arm/boot/compressed/head.S