tree c438e085b6b21b93b3caface078e7990cc6992d4
parent cd5b49bce361caeb7488f5fa801326bcd799f6f2
parent ba305e31e88ea5c2f598ff9fbc5424711a429e30
author Linus Torvalds <torvalds@linux-foundation.org> 1322699064 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1322699064 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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