Merge branch 'rebase-linaro-configs-3.4' into merge-linux-linaro-core-tracking