From: Tony Lindgren <tony@atomide.com>
Date: Fri, 28 Mar 2008 10:59:38 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~92
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6f19ae4ef12a69feba69bf5234c43c5ff7b9b970;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

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
---

6f19ae4ef12a69feba69bf5234c43c5ff7b9b970
diff --cc Makefile
index f94e22a41c3,b08a259e21d..3ec3d6ab4cc
--- a/Makefile
+++ b/Makefile
@@@ -194,9 -189,9 +194,9 @@@ SUBARCH := ar
  # 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)