Merge with /home/tmlind/src/kernel/linux-2.6

diff --combined Makefile
index b7c9218a50202314da26364c13412a17f3926b3d,5187fee780800bc000746fdaf269b7daf25bbc4b..f6a56a1b4d6c05677bf4652c9f7ecddaa2d45de0
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 15
- EXTRAVERSION =-rc2
+ EXTRAVERSION =-rc3
  NAME=Affluent Albatross
  
  # *DOCUMENTATION*
@@@ -10,9 -10,6 +10,9 @@@
  # Comments in this file are targeted only to the developer, do not
  # expect to learn how to build the kernel reading this file.
  
 +# Add custom flags here to avoid conflict with updates
 +EXTRAVERSION := $(EXTRAVERSION)-omap1
 +
  # Do not print "Entering directory ..."
  MAKEFLAGS += --no-print-directory
  
@@@ -173,7 -170,6 +173,7 @@@ SUBARCH := $(shell uname -m | sed -e s/
                                  -e s/arm.*/arm/ -e s/sa110/arm/ \
                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
                                  -e s/ppc64/powerpc/ )
 +SUBARCH := arm
  
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
@@@ -195,7 -191,7 +195,7 @@@
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
  
  ARCH          ?= $(SUBARCH)
 -CROSS_COMPILE ?=
 +CROSS_COMPILE ?= arm-linux-
  
  # Architecture as present in compile.h
  UTS_MACHINE := $(ARCH)