From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Apr 2012 17:26:41 +0000 (-0700)
Subject: Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v3.4-rc3~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53cb430755f7dd36e42fa02603d166a07f3d94cd;p=platform%2Fkernel%2Flinux-stable.git

Merge tag 'regulator-3.4' of git://git./linux/kernel/git/broonie/regulator

Pull a regulator build fix from Mark Brown:
 "Fix a build warning in the anatop driver for 3.4

  This is a trivial rename to stop the build system complaining that
  we're referencing things we shouldn't be."

* tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: anatop: fix 'anatop_regulator' name collision
---

53cb430755f7dd36e42fa02603d166a07f3d94cd