diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-05-07 23:55:56 -0600 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-05-07 23:55:56 -0600 |
commit | 0135f6a04642c192bdf4b36e06937d3387e174ff (patch) | |
tree | 43ccd859fa25998780f029700b86a9a0bbe500be /arch/arm/mach-omap2/clock3xxx_data.c | |
parent | f0c54d31b04243ab761dc0d7a122b77adf8d0a3a (diff) | |
parent | 610eb8c218ef214594295776275855640d37ab2a (diff) | |
parent | 8f97437eb54f32bb8678904c2f827a853a3d076c (diff) | |
parent | 48a6884fd14d6e3c0efc3d97621c662ee6f6ae0f (diff) | |
download | linux-0135f6a04642c192bdf4b36e06937d3387e174ff.tar.gz linux-0135f6a04642c192bdf4b36e06937d3387e174ff.tar.bz2 linux-0135f6a04642c192bdf4b36e06937d3387e174ff.zip |
Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel_a_3.5' and 'pwrdm_clkdm_cleanup_3.5' into prcm_devel_a_3.5