Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge

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

diff --cc arch/arm/mach-omap2/serial.c
index 0f508109adcc7326e2f57affa55809b6015a7695,ca28424f2fbda8accdd2ee66f48a54956e6ffea1..021130d830b5c42ddd28534a1e8d74f67a9134b2
--- 1/arch/arm/mach-omap2/serial.c
--- 2/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@@ -565,20 -550,9 +565,20 @@@ static struct omap_uart_state omap_uart
                        },
                },
        },
 +#ifdef CONFIG_ARCH_OMAP4
 +      {
 +              .pdev = {
 +                      .name                   = "serial8250",
 +                      .id                     = 3
 +                      .dev                    = {
 +                              .platform_data  = serial_platform_data3,
 +                      },
 +              },
 +      },
 +#endif
  };
  
- void __init omap_serial_init(void)
+ void __init omap_serial_early_init(void)
  {
        int i;
        char name[16];