Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --combined MAINTAINERS
index d08284b26b03f50c132ba2f43b177f7c6a117a2e,8f0ec46a7096132683b5ba7368c239c6519f127d..892398ae6423c3700708eb08582bd9948376f734
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3951,7 -3951,7 +3951,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
@@@ -4431,10 -4431,10 +4431,10 @@@ M:   johnpol@2ka.mipt.r
  S:    Maintained
  
  W83791D HARDWARE MONITORING DRIVER
- P:    Charles Spirakis
- M:    bezaur@gmail.com
+ P:    Marc Hulsman
+ M:    m.hulsman@tudelft.nl
  L:    lm-sensors@lm-sensors.org
- S:    Odd Fixes
+ S:    Maintained
  
  W83793 HARDWARE MONITORING DRIVER
  P:    Rudolf Marek

diff --combined Makefile
index 8c8482b5c514dbb1f8d739d423262600384f2dba,6aff5f47c21d1f13c633de4f14835688c49244db..d7805579be9eaee97841b3b3812bb49ded663eb2
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 26
- EXTRAVERSION = -rc7
+ EXTRAVERSION = -rc8
  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)