Merge branch 'omap-clks3' into devel

Conflicts:

	arch/arm/mach-omap2/clock.c

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

diff --cc arch/arm/mach-omap2/clock.c
index ce4d46a4a8381d2bd2b0cff19f840ae16ac2c153,f49bce997a0b7ffd9c0fc9194057a7759c08d029..4247a1534411ba9f9cf5bfd23c9abf94bcd799c0
--- 1/arch/arm/mach-omap2/clock.c
--- 2/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@@ -576,8 -674,8 +674,8 @@@ u32 omap2_divisor_to_clksel(struct clk 
        WARN_ON(div == 0);
  
        clks = omap2_get_clksel_by_parent(clk, clk->parent);
-       if (clks == NULL)
+       if (!clks)
 -              return 0;
 +              return ~0;
  
        for (clkr = clks->rates; clkr->div; clkr++) {
                if ((clkr->flags & cpu_mask) && (clkr->div == div))

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge