From: Olof Johansson <olof@lixom.net>
Date: Thu, 8 Mar 2012 17:33:44 +0000 (-0800)
Subject: Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
X-Git-Tag: firefly_0821_release~3680^2~3234^2~9
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers

* 'regulator' of git://github.com/hzhuang1/linux: (2 commits)
  regulator: Remove bq24022 regulator driver
  pxa: magician/hx4700: Convert to gpio-regulator from bq24022

  (plus update to v3.3-rc6)
---

990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d