Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
  omap2: Make OMAP2PLUS select OMAP_DM_TIMER
  OMAP4: hwmod data: Fix alignment and end of line in structurefields
  OMAP4: hwmod data: Move the DMA structures
  OMAP4: hwmod data: Move the smartreflex structures
  OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
  arm: omap: tusb6010: add name for MUSB IRQ
  arm: omap: craneboard: Add USB EHCI support
  omap2+: Initialize serial port for dynamic remuxing for n8x0
  omap2+: Add struct omap_board_data and use it for platform level serial init
  omap2+: Allow hwmod state changes to mux pads based on the state changes
  omap2+: Add support for hwmod specific muxing of devices
  omap2+: Add omap_mux_get_by_name
  OMAP2: PM: fix compile error when !CONFIG_SUSPEND
  MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
  OMAP4: Smartreflex framework extensions
  OMAP4: hwmod: Add inital data for smartreflex modules.
  OMAP4: PM: Program correct init voltages for scalable VDDs
  OMAP4: Adding voltage driver support
  OMAP4: Register voltage PMIC parameters with the voltage layer
  OMAP3: PM: Program correct init voltages for VDD1 and VDD2
  ...

Fix up trivial conflict in arch/arm/plat-omap/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap1/time.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index 8be2615,d457b59..0b34bed
--- 1/arch/arm/mach-omap2/board-omap3pandora.c
--- 2/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -636,19 -636,37 +636,19 @@@ static struct spi_board_info omap3pando
  
  static void __init omap3pandora_init_irq(void)
  {
-       omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
-                            mt46h32m32lf6_sdrc_params);
+       omap2_init_common_infrastructure();
+       omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
+                                 mt46h32m32lf6_sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
  }
  
 -static void pandora_wl1251_set_power(bool enable)
 -{
 -      /*
 -       * Keep power always on until wl1251_sdio driver learns to re-init
 -       * the chip after powering it down and back up.
 -       */
 -}
 -
 -static struct wl12xx_platform_data pandora_wl1251_pdata = {
 -      .set_power      = pandora_wl1251_set_power,
 -      .use_eeprom     = true,
 -};
 -
 -static struct platform_device pandora_wl1251_data = {
 -      .name           = "wl1251_data",
 -      .id             = -1,
 -      .dev            = {
 -              .platform_data  = &pandora_wl1251_pdata,
 -      },
 -};
 -
 -static void pandora_wl1251_init(void)
 +static void __init pandora_wl1251_init(void)
  {
 +      struct wl12xx_platform_data pandora_wl1251_pdata;
        int ret;
  
 +      memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata));
 +
        ret = gpio_request(PANDORA_WIFI_IRQ_GPIO, "wl1251 irq");
        if (ret < 0)
                goto fail;

diff --cc arch/arm/mach-omap2/dpll3xxx.c
index ebb888f,5df9f53..f77022b
--- 1/arch/arm/mach-omap2/dpll3xxx.c
--- 2/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@@ -30,11 -29,10 +30,9 @@@
  
  #include <plat/cpu.h>
  #include <plat/clock.h>
 -#include <asm/clkdev.h>
  
  #include "clock.h"
- #include "prm.h"
- #include "prm-regbits-34xx.h"
- #include "cm.h"
+ #include "cm2xxx_3xxx.h"
  #include "cm-regbits-34xx.h"
  
  /* CM_AUTOIDLE_PLL*.AUTO_* bit values */

diff --cc arch/arm/mach-omap2/include/mach/entry-macro.S
Simple merge

diff --cc arch/arm/mach-omap2/omap4-common.c
Simple merge

diff --cc arch/arm/mach-omap2/timer-gp.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
index c940843,bc0c7aa..18fe3cb
--- 1/arch/arm/plat-omap/Kconfig
--- 2/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -17,7 -17,8 +17,8 @@@ config ARCH_OMAP
  
  config ARCH_OMAP2PLUS
        bool "TI OMAP2/3/4"
 -      select COMMON_CLKDEV
 +      select CLKDEV_LOOKUP
+       select OMAP_DM_TIMER
        help
          "Systems based on OMAP2, OMAP3 or OMAP4"
  

diff --cc arch/arm/plat-omap/include/plat/clkdev_omap.h
Simple merge