Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --combined MAINTAINERS
index 3e12307eee43f0f0431217ec89a1007609aa498d,90dcbbcad91c8541326d7179e7bc313880b8bf10..777c4aeb624c3a70d4f2c824ad23b3aa55b28546
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -163,6 -163,12 +163,12 @@@ M:       A2232@gmx.ne
  L:    linux-m68k@lists.linux-m68k.org
  S:    Maintained
  
+ AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
+ P:    David Howells
+ M:    dhowells@redhat.com
+ L:    linux-afs@lists.infradead.org
+ S:    Supported
+ 
  AIO
  P:    Benjamin LaHaise
  M:    bcrl@kvack.org
@@@ -2314,8 -2320,6 +2320,6 @@@ L:      kexec@lists.infradead.or
  S:    Maintained
  
  KPROBES
- P:    Prasanna S Panchamukhi
- M:    prasanna@in.ibm.com
  P:    Ananth N Mavinakayanahalli
  M:    ananth@in.ibm.com
  P:    Anil S Keshavamurthy
@@@ -3842,7 -3846,7 +3846,7 @@@ S:      Maintaine
  
  TI OMAP MMC INTERFACE DRIVER
  P:    Carlos Aguiar, Anderson Briglia and Syed Khasim
 -M:    linux-omap-open-source@linux.omap.com (subscribers only)
 +M:    linux-omap@vger.kernel.org
  W:    http://linux.omap.com
  W:    http://www.muru.com/linux/omap/
  S:    Maintained

diff --combined Makefile
index 3ec3d6ab4cc12f5aefff92088a05723578f8e1cc,fec2a12710eb37ba72f65a394d7e8aa9284485d9..44dbadd4a6dfb5419729e4e5997f1c27750bff4b
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 25
- EXTRAVERSION = -rc7
+ EXTRAVERSION = -rc8
  NAME = Funky Weasel is Jiggy wit it
  
  # *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)