Merge with mainline

diff --cc Makefile
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/mmc/Kconfig
index 8141f9c32be5bde1b8595f85d6ed2d540139fa42,4991bbd054f31fcbc86b4b0871dec7777d00154c..b094a95cc3a2fee349d9dfc5586f865646142c96
--- 1/drivers/mmc/Kconfig
--- 2/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@@ -66,39 -49,9 +66,39 @@@ config MMC_PX
  
          If unsure, say N.
  
 +config MMC_OMAP
 +      tristate "TI OMAP Multimedia Card Interface support"
 +      depends on ARCH_OMAP && MMC
 +      select TPS65010 if MACH_OMAP_H2
 +      help
 +        This selects the TI OMAP Multimedia card Interface.
 +        If you have an OMAP board with a Multimedia Card slot,
 +        say Y or M here.
 +
 +        If unsure, say N.
 +
 +config MMC_OMAP16XX_BLOCK1
 +      boolean "First MMC block on OMAP16XX"
 +      depends on ARCH_OMAP16XX && MMC_OMAP
 +      default y if MACH_OMAP_H2 || MACH_OMAP_H3
 +      help
 +        This enables the first of two MMC blocks on OMAP1610 multimedia
 +        processor. You need to enable the correct block to activate your
 +        MMC slot.
 +
 +config MMC_OMAP16XX_BLOCK2
 +      boolean "Second MMC block on OMAP16XX"
 +      depends on ARCH_OMAP16XX && MMC_OMAP
 +      default n if MACH_OMAP_H2 || MACH_OMAP_H3
 +      default y
 +      help
 +        This enables the second of two MMC blocks on OMAP1610 multimedia
 +        processor. You need to enable the correct block to activate your
 +        MMC slot.
 +
  config MMC_WBSD
        tristate "Winbond W83L51xD SD/MMC Card Interface support"
-       depends on MMC && ISA && ISA_DMA_API
+       depends on MMC && ISA_DMA_API
        help
          This selects the Winbond(R) W83L51xD Secure digital and
            Multimedia card Interface.

diff --cc drivers/mmc/mmc_block.c
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc kernel/printk.c
Simple merge