From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Dec 2011 00:24:24 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: MMI-PSA29.97-13-9~17946
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d6e92d360c21494ed4ce3bcfa7c84b90cb075bba;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/broonie/regulator

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: twl: fix twl4030 support for smps regulators
  regulator: fix use after free bug
  regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
---

d6e92d360c21494ed4ce3bcfa7c84b90cb075bba