diff options
author | Kevin Hilman <khilman@ti.com> | 2012-03-12 15:36:23 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-03-12 15:36:23 -0700 |
commit | 05d164c9b546fb02b079e2a398b16ea4466e9615 (patch) | |
tree | d4af5540d9e3b33036333cbae9796e536f07f4f7 /net/lapb/lapb_iface.c | |
parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
parent | 46eda3e96a65b378041c79c51ff2e02009f7e2d0 (diff) |
Merge tag 'topic/twl' into for_3.4/pm/smps-regulator
TWL specific changes, cross-merged with OMAP due to arch/arm wanting to
use the new ability to override the voltage set and get operations to
support the in-CPU voltage management. The other changes are minor
fixes, the addition of a few new regulators and device tree support.
Diffstat (limited to 'net/lapb/lapb_iface.c')
0 files changed, 0 insertions, 0 deletions