From: Tony Lindgren <tony@atomide.com>
Date: Fri, 10 Oct 2008 08:20:57 +0000 (+0300)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.27-omap1~56
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b6645c35843b9608bed8c2981fc53b942758853f;hp=-c;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
---

b6645c35843b9608bed8c2981fc53b942758853f
diff --combined Makefile
index cd253ffa751,16e3fbb968a..1b8c762c0d2
--- a/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 27
- EXTRAVERSION = -rc9
+ EXTRAVERSION =
  NAME = Rotary Wombat
  
  # *DOCUMENTATION*
@@@ -16,9 -16,6 +16,9 @@@
  # o  print "Entering directory ...";
  MAKEFLAGS += -rR --no-print-directory
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
@@@ -174,8 -171,6 +174,8 @@@ SUBARCH := $(shell uname -m | sed -e s/
  				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
  				  -e s/sh.*/sh/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
@@@ -196,7 -191,7 +196,7 @@@
  # 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)