Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	arch/arm/plat-omap/devices.c

diff --combined Makefile
index 997e329,cab896a..5713b16
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 27
- EXTRAVERSION = -rc6
+ EXTRAVERSION = -rc7
  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)

diff --combined drivers/media/video/Kconfig
index 2703c66,3e9e0dc..f914577
--- 1/drivers/media/video/Kconfig
--- 2/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -295,14 -295,6 +295,14 @@@ config VIDEO_TCM825
          This is a driver for the Toshiba TCM825x VGA camera sensor.
          It is used for example in Nokia N800.
  
 +config VIDEO_OV9640
 +      tristate "OmniVision OV9640 sensor support"
 +      depends on I2C && VIDEO_V4L2
 +      ---help---
 +        This is a Video4Linux2 sensor-level driver for the OmniVision
 +        OV9640 camera.  It is currently working with the TI OMAP2
 +        camera controller.
 +
  config VIDEO_SAA7110
        tristate "Philips SAA7110 video decoder"
        depends on VIDEO_V4L1 && I2C
@@@ -762,8 -754,6 +762,8 @@@ source "drivers/media/video/au0828/Kcon
  
  source "drivers/media/video/ivtv/Kconfig"
  
 +source drivers/media/video/omap/Kconfig
 +
  source "drivers/media/video/cx18/Kconfig"
  
  config VIDEO_M32R_AR
@@@ -794,15 -784,6 +794,15 @@@ config VIDEO_CAFE_CCI
          CMOS camera controller.  This is the controller found on first-
          generation OLPC systems.
  
 +config VIDEO_OMAP2
 +      tristate "OMAP 2 Camera support (EXPERIMENTAL)"
 +      select VIDEOBUF_GEN
 +      select VIDEOBUF_DMA_SG
 +      depends on VIDEO_V4L2 && ARCH_OMAP24XX
 +      ---help---
 +        Driver for an OMAP 2 camera controller.
 +
 +
  #
  # USB Multimedia device configuration
  #
@@@ -987,7 -968,7 +987,7 @@@ config VIDEO_PXA27
  
  config VIDEO_SH_MOBILE_CEU
        tristate "SuperH Mobile CEU Interface driver"
-       depends on VIDEO_DEV
+       depends on VIDEO_DEV && HAS_DMA
        select SOC_CAMERA
        select VIDEOBUF_DMA_CONTIG
        ---help---