Automatically merging tracking-ll-misc-fixes into merge-linux-linaro

Conflicting files:
arch/arm/mach-exynos/headsmp.S