Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

 Conflicts:
	arch/arm64/kernel/Makefile