Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 18 Mar 2012 21:39:19 +0000 (21:39 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 18 Mar 2012 21:39:19 +0000 (21:39 +0000)
commit115e4bfd5bc68f870b3c889ab8f2d2733bcda452
treed72053747d59cd5c537919990144c078d6b8cb55
parentc02f935f5f646fe1b5dbcd909e9d09c3a912914e
parent5bc78015998e14bf0362a01fc47e8b63053dbfd8
Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
drivers/mfd/twl-core.c
drivers/regulator/core.c