mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-13 07:31:07 +00:00
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
This commit is contained in:
commit
a8822e2d57
3 changed files with 166 additions and 3 deletions
Loading…
Add table
Add a link
Reference in a new issue