| commit | a8822e2d570bc265c9fa0347710fbcc7bef8b327 | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Mon Apr 30 10:08:29 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Mon Apr 30 10:08:29 2012 -0700 |
| tree | 4a5b198d5ab6bdde620f9dbe8282a10604a204a4 | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a [diff] | |
| parent | 39358f2b57f37fe079eff4159307c844a0bfb176 [diff] |
Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-regulator Conflicts: arch/arm/mach-omap2/twl-common.c