Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus

diff --cc arch/arm/mach-omap1/Kconfig
Simple merge

diff --cc arch/arm/mach-omap1/clock_data.c
index 9240bc1,ca4bd86..af54114
--- 1/arch/arm/mach-omap1/clock_data.c
--- 2/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@@ -475,27 -548,9 +548,27 @@@ static struct clk usb_dc_ck7xx = 
        /* Direct from ULPD, no parent */
        .rate           = 48000000,
        .enable_reg     = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
-       .enable_bit     = 8,
+       .enable_bit     = SOFT_USB_OTG_DPLL_REQ_SHIFT,
  };
  
 +static struct clk uart1_7xx = {
 +      .name           = "uart1_ck",
 +      .ops            = &clkops_generic,
 +      /* Direct from ULPD, no parent */
 +      .rate           = 12000000,
 +      .enable_reg     = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
 +      .enable_bit     = 9,
 +};
 +
 +static struct clk uart2_7xx = {
 +      .name           = "uart2_ck",
 +      .ops            = &clkops_generic,
 +      /* Direct from ULPD, no parent */
 +      .rate           = 12000000,
 +      .enable_reg     = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
 +      .enable_bit     = 11,
 +};
 +
  static struct clk mclk_1510 = {
        .name           = "mclk",
        .ops            = &clkops_generic,

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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