diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-04-30 10:08:29 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-04-30 10:08:29 -0700 |
| commit | a8822e2d570bc265c9fa0347710fbcc7bef8b327 (patch) | |
| tree | 4a5b198d5ab6bdde620f9dbe8282a10604a204a4 /scripts/patch-kernel | |
| parent | Linux 3.4-rc5 (diff) | |
| parent | Merge branch 'pm-wip/smps-regulator' into for_3.4/pm/smps-regulator (diff) | |
| download | linux-a8822e2d570bc265c9fa0347710fbcc7bef8b327.tar.gz linux-a8822e2d570bc265c9fa0347710fbcc7bef8b327.zip | |
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
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions