Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

diff --combined MAINTAINERS
index badfe06a27742da2d335b086dbb7847e15ec4cfb,fbc8fa58d56d4ec7cd09603341a4941f0a42788c..304214759a8e8c993768044b5bc46223a07b1123
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2979,7 -2979,6 +2979,7 @@@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CO
  P:    Felipe Balbi
  M:    felipe.balbi@nokia.com
  L:    linux-usb@vger.kernel.org
 +T:    git gitorious.org:/musb/mainline.git
  S:    Maintained
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
@@@ -4530,7 -4529,7 +4530,7 @@@ S:      Maintaine
  USB VIDEO CLASS
  P:    Laurent Pinchart
  M:    laurent.pinchart@skynet.be
- L:    linux-uvc-devel@lists.berlios.de
+ L:    linux-uvc-devel@lists.berlios.de (subscribers-only)
  L:    video4linux-list@redhat.com
  W:    http://linux-uvc.berlios.de
  S:    Maintained

diff --combined Makefile
index 19ce316fc395ba33352fbfe342942aeca3fad355,71e98e9e6acd3fd69d868843a000e7d8fc0363f2..888e6c65f8568c9b7adb9c136d9528ccdcbf2de4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 28
- EXTRAVERSION = -rc9
+ EXTRAVERSION =
  NAME = Erotic Pickled Herring
  
  # *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)