Merge branches 'master' and 'linus'
Conflicts:
arch/arm/plat-omap/Makefile
arch/arm/plat-omap/gpio.c
drivers/i2c/busses/i2c-omap.c
include/asm-arm/arch-omap/dsp_common.h
# Alternatively CROSS_COMPILE can be set in the environment.
# Default value for CROSS_COMPILE is not to prefix executables
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
-
+ export KBUILD_BUILDHOST := $(SUBARCH)
ARCH ?= $(SUBARCH)
-CROSS_COMPILE ?=
+CROSS_COMPILE ?= arm-linux-
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)