Merge branches 'next/driver', 'next/timer', 'next/voltage', 'next/dmtimer' and 'next...

diff --cc arch/arm/mach-omap2/io.c
index c14308caf9d3cfe81ca45dd95e89250d26037459,15f91c42be66da8d1a09ac3f7def84101a5c1b45,1a13b791655446e57fdc0c1c02b4dc1e23efdc9c,2ce1ce6fb4dbd7e1db81a48ad47f3c709e233c87..f01273006e4d1d79494b524b29fe3455566e293a
--- 1/arch/arm/mach-omap2/io.c
--- 2/arch/arm/mach-omap2/io.c
--- 3/arch/arm/mach-omap2/io.c
--- 4/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@@@ -341,14 -342,17 -341,14 -341,14 +342,17 @@@@@ void __init omap2_init_common_infrastru
        u8 postsetup_state;
    
        if (cpu_is_omap242x()) {
   -            omap2xxx_powerdomains_init();
   -            omap2xxx_clockdomains_init();
+ ++            omap2xxx_voltagedomains_init();
   +            omap242x_powerdomains_init();
   +            omap242x_clockdomains_init();
                omap2420_hwmod_init();
        } else if (cpu_is_omap243x()) {
   -            omap2xxx_powerdomains_init();
   -            omap2xxx_clockdomains_init();
+ ++            omap2xxx_voltagedomains_init();
   +            omap243x_powerdomains_init();
   +            omap243x_clockdomains_init();
                omap2430_hwmod_init();
        } else if (cpu_is_omap34xx()) {
+ ++            omap3xxx_voltagedomains_init();
                omap3xxx_powerdomains_init();
                omap3xxx_clockdomains_init();
                omap3xxx_hwmod_init();

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

diff --cc arch/arm/mach-omap2/pm.c
index 25b8c7f43852cbd5af4cd39586b8d66af40137a5,d34fc5206b4a18989a034be273c9ac18a9b663c1,472bf22d5e84875416854c3e76c206fa02c85302,3feb35911a325576bf7a6f57892adbcccbeda853..0844e2ecfb4ab56c7330cec33e6dbeb526bdf223
--- 1/arch/arm/mach-omap2/pm.c
--- 2/arch/arm/mach-omap2/pm.c
--- 3/arch/arm/mach-omap2/pm.c
--- 4/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@@@@ -181,9 -181,9 -181,9 -183,9 +181,9 @@@@@ static int __init omap2_set_init_voltag
                goto exit;
        }
    
- --    voltdm = omap_voltage_domain_lookup(vdd_name);
+ ++    voltdm = voltdm_lookup(vdd_name);
        if (IS_ERR(voltdm)) {
 ---            printk(KERN_ERR "%s: Unable to get vdd pointer for vdd_%s\n",
 +++            pr_err("%s: unable to get vdd pointer for vdd_%s\n",
                        __func__, vdd_name);
                goto exit;
        }

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

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