tree 7a9da9b82839e09d1f49b0116c422585a56ebff2
parent 6a8ec449204ca9cf070c8028b3eb419dfb060688
parent 041fa155e0a7a49d4084be684f855e2a32c17324
author Andrey Konovalov <andrey.konovalov@linaro.org> 1397677987 +0400
committer Andrey Konovalov <andrey.konovalov@linaro.org> 1397677987 +0400

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

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