Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 19:24:48 +0000 (19:24 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 19:24:48 +0000 (19:24 +0000)
commit5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572
treef28c0307e82adf901277ae4e877dd2db7b620317
parentbd0ec7c1e52423429d9ee7b34e2c899f01db01b0
parent9997f3ffbbcde01bcd5966eeb26bc41243715021
Merge branch 'topic/tps51632' of git://git./linux/kernel/git/broonie/regulator into regulator-min

Conflicts:
drivers/regulator/tps51632-regulator.c
drivers/regulator/tps51632-regulator.c