Merge branch 'pm-wip/smps-regulator' into for_3.4/pm/smps-regulator
authorKevin Hilman <khilman@ti.com>
Mon, 12 Mar 2012 22:36:45 +0000 (15:36 -0700)
committerKevin Hilman <khilman@ti.com>
Mon, 12 Mar 2012 22:36:45 +0000 (15:36 -0700)

Trivial merge